Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  • official Apache Bigtop repo

    Code Block
    languagebash
    titleClone the repo
    git clone https://git-wip-usgitbox.apache.org/repos/asf/bigtop.git


  • or from Github mirror (see https://github.com/apache/bigtop)

How to generate patches by formatting patch files

We use git as our version control system. To streamline the process of giving proper credit to the contributors when committing patches, we encourage contributors to submit patches generated using git format-patch. This has many benefits:

...

The naming of the patch file is up to you. The preferred way however is to just name the file after the JIRA ticket e.g. BIGTOP-1031.patch. In the latter case, If case you need to upload another version  of the patch, you should keep the file name the same and JIRA will sort them according to date/time if multiple files have the same name. This feature is also useful to traceback the history of a patch and roll-back to an earlier version if needed.

How to generate patches by creating pull requests

  1. Folk Bigtop from https://github.com/apache/bigtop
  2. Develop your patch in your own branch
  3. Ensure that you have all of your change as 1 commit which has the correct commit message - something like BIGTOP-1031: README has outdated/ambiguous information
  4. Create a Pull Request against Bigtop master branch on Github with the PR title BIGTOP-1031: README has outdated/ambiguous information

REVIEWING PATCHES (reviewer guidelines)

...

Code Block
#inital setup of repo
git init 
# Development step on master
echo step1 >file
git add file
git commit -m step1

# Now we branch the release candidate
git checkout -b branch-1.0
# and doing the release
echo release >changelog
git add changelog
git commit -m "release-1.0 branch finished"
git tag release-1.0.0
# development on master continues
git checkout master
echo development > development
git add development
git commit -m "development on master"

# Oops two fixes are needed
# create a working branch for these
git checkout branch-1.0
git checkout -b fixes-1.0
echo "fix 1 1.0" to  >fix10
echo "fix 2 1.0" to  >fix20
git add fix10 
git commit -m "fix 1 on 1.0.0" fix10
git add fix20
git commit -m "fix 2 on 1.0.0" fix20
# merge fix branch in release branch0
git checkout branch-1.0
git merge -m "merge fixes-1.0" fixes-1.0
# new release
echo release 1.0.1 >> changelog
git add changelog
git commit -m "release-1.0.1" 
git tag release-1.0.1
# Merge fixes on development, too
git checkout master
git merge -m "merge fixes-1.0" fixes-1.0 
# continue development
echo devel >>development 
git commit -a -m "development2"

 

 

 

...