Wednesday, December 30, 2015

Git-Gerrit Made Easy - Part 2

First Procedure:

1.   At First, commit your change to local branch.
2.   ($ git log --oneline --decorate --graph). Then grab the commit id.
3.   fetch my origin ($ git fetch origin)
4.   and then rebase master. ($ git rebase origin/master)
5.   Then I have to give the push command.( $ git push origin HEAD:refs/for/develop).
6.   Finished. Now need new code for further development:
7.   $ git fetch origin
8.   $ git checkout -b task#2021 origin/develop

Second Procedure:

l  At First, commit your change to local branch.
l  ($ git log --oneline --decorate --graph). Then grab the commit id.
l  fetch my origin ($ git fetch origin)
l  and then rebase master. ($ git rebase origin/master)
l  If any kind of problem occurs in rebasing position. I have to create a new branch from origin/master. Then cherry-pick the previous commit id. Then push it.
l  Create a new branch (git checkout -b bug#75#L origin/master)
l  Then cherry-pick the commit id(git cherry-pick b6e82b5)
l  Then I have to give the push command.( $ git push origin HEAD:refs/for/develop).
l  After pushing, we need to create a new branch for further coding. For this reason we need to fetch the origin. Then I have to create a branch.
l  $ git fetch origin
l  $ git checkout -b task#2021 origin/develop

REVIEW, FEEDBACK AND PATCH SET:

I have pushed all fixes. My TL reviews the code and want some comments. So he gives some feedback. I have added all comments and make a patch set using the previous commit ID 26889. All step are given below step by step:

USER@zakir-rizvi MINGW64 /c/bapf/eBuilder722/eclipse/workspace/bookstore_project (bug#75#1)
$ git push origin HEAD:refs/for/develop
Counting objects: 17, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (13/13), done.
Writing objects: 100% (17/17), 2.56 KiB | 0 bytes/s, done.
Total 17 (delta 10), reused 0 (delta 0)
remote:
remote: New Changes:
remote:   https://review.g2it.com:8443/26889
remote:
To ssh://abu.rizvi@review.g2it.com:29418/bookstore_project
 * [new branch]      HEAD -> refs/for/develop

USER@zakir-rizvi MINGW64 /c/bapf/eBuilder722/eclipse/workspace/bookstore_project (bug#75#1)
$ git branch
* bug#75#1
  master

USER@zakir-rizvi MINGW64 /c/bapf/eBuilder722/eclipse/workspace/bookstore_project (bug#75#1)
$ git push origin HEAD:refs/changes/26889
Counting objects: 17, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (13/13), done.
Writing objects: 100% (17/17), 2.54 KiB | 0 bytes/s, done.
Total 17 (delta 10), reused 0 (delta 0)
To ssh://abu.rizvi@review.g2it.com:29418/bookstore_project
 * [new branch]      HEAD -> refs/changes/26889

USER@zakir-rizvi MINGW64 /c/bapf/eBuilder722/eclipse/workspace/bookstore_project (bug#75#1)
$ git push origin HEAD:refs/changes/26889
Counting objects: 17, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (13/13), done.
Writing objects: 100% (17/17), 2.54 KiB | 0 bytes/s, done.
Total 17 (delta 10), reused 0 (delta 0)
To ssh://abu.rizvi@review.g2it.com:29418/bookstore_project

 * [new branch]      HEAD -> refs/changes/26889

No comments:

Post a Comment