Re: migrating pull requests to Gerrit


Brian Behlendorf <bbehlendorf@...>
 


Missing from the new home, but one can still find them on github.

Ry, can we keep a copy of the commit log/transactions on the repo while it was live on github, just in case github ever disappears?  Maybe I'm getting more rattled by the disappearance of gmane than I should be, but it pays to be a bit paranoid here.  I know we can't un-squish the history, but just want a place we can reference it if ever necessary, even if that's as a tarball one has to unzip locally to search.

Brian

On 07/31/2016 02:58 AM, Baohua Yang wrote:
Yes, that could find the transfer point.

A little pity, the previous commit logs were gone~~

Thanks!

On Sun, Jul 31, 2016 at 5:26 PM, Ry Jones <rjones@...> wrote:
git log will show you.

https://gerrit.hyperledger.org/r/gitweb?p=fabric.git;a=commit;h=0716064b25428ea2426fa589db365c419726b24b

author Christopher Ferris <chrisfer@...>
Tue, 26 Jul 2016 12:28:36 -0700 (12:28 -0700)

transfer from GitHub hyperledger/fabric

Copied from commit sha 346f9fb448140e931fed73b46f528de6dacbc0d0
to Gerrit. Verified that all DCO signoff received or IBM
contribution.

Change-Id: I812a2f48382a3cd37e153cd056d0ea94b7f416a0
Signed-off-by: Christopher Ferris <chrisfer@...>

On Sat, Jul 30, 2016 at 4:39 AM, Baohua Yang <yangbaohua@...> wrote:
That's really great!

However, I found all commit logs are missing (I guess logs can be remained during repo migration?).

And, from which original commit did we migrate?

The existing commit log in gerrit is as the following:

69345fa1aa2d64a8bf47642b37eaa01926c8ce48 Merge "Fixes issue #2272 - sdk/node build issues"
cfeafaca8a318d86c76d4943bfc1c687c7ebc383 Merge "Refactor docs for migration to gerrit"
1c214ab437ecb6b246a47adac8ba87f01eaa8082 Merge "Update chaintool"
a80a79b203cabec182984188f1c78d8fe303c36e Merge "Modify example 'chaincode_example_06'"
293c343c11ec1c29b515b534938970b446f3c986 Fixes issue #2272 - sdk/node build issues
73a03bff7983775075a90f1124b0a4b1555a0e6b Refactor docs for migration to gerrit
8a70bc9c1976fc262e90778416ad1cc3e4e2755c Modify example 'chaincode_example_06'
654abb4c5e78d210a2de25b7cc99c69b57f6430d Merge "Log debug message when KDFKey is missing"
5ed655c76dcb103a2ab28c92754b0d1b6139db6c Update chaintool
5d674e4a3a1b1dfd23ece16ade3a6c644a4de5a5 Log debug message when KDFKey is missing
fb7da0dea5344a1989c44aa934370aa396f149d7 Clarify process for adding and removing maintainers
0716064b25428ea2426fa589db365c419726b24b transfer from GitHub hyperledger/fabric
a0f4c0d0574ffcf499beace6b229c540be5ba9bf Initial empty repository

On Wed, Jul 27, 2016 at 8:51 PM, Christopher B Ferris <chrisfer@...> wrote:
All,

Migrating PRs that have been submitted (or are in-progress) to Gerrit involves creating a patch set that you can apply to your new Gerrit clone (see previous email).

As a reminder our Gerrit is here https://gerrit.hyperledger.org/r/#/admin/projects/fabric

Step 1 rebase your PR commits in your local clone of your hyperledger/fabric fork
a. git checkout master
b. git fetch origin master
c. git checkout <your PR branch>
d. git rebase -i origin/master
e. <optionally, resolve any merge conflicts>
f. git push -f

Step 2 generate a patch for your PR from your hyperledger-fabric fork
a. open your GH fork repo page
b. change to your PR's branch
c. right below the branch selector you should see "This branch is N commits ahead of hyperledger:master
d. on the right-hand side of that bar, click on the 'Compare' glyph. this will open a page comparing your changes with the origin and should have a URL like this example: https://github.com/hyperledger/fabric/compare/master...christo4ferris:issue-2277
e. append '.patch' to that URL in your browser window and you will be redirected to a raw patchset for your changes. COPY this URL, which should look something like this: https://github.com/hyperledger/fabric/compare/master...christo4ferris:issue-2277.patch
f. open a terminal window and copy this patchset to your local machine e.g. 'curl -XGET https://github.com/hyperledger/fabric/compare/master...christo4ferris:issue-2277.patch -o 2277.patch'

Step 3 apply the patch for your PR to your Gerrit clone
a. cd <your gerrit clone dir>
b. git checkout -b <your PR branch>
c. git apply <path to patchset>/<patchset filename>
d. git add *
e. git commit -s
f. add commit message, etc
g. git push origin HEAD:refs/for/master

Step 4 visit Gerrit to check that your commit was pushed and created a review.

Please let me know if you have any difficulties with transferring your PRs. I'll be on slack all day.

Cheers,



Christopher Ferris

IBM Distinguished Engineer, CTO Open Technology

IBM Cloud, Open Technologies

email: chrisfer@...

twitter: @christo4ferris

blog: https://developer.ibm.com/opentech/author/chrisfer/

phone: +1 508 667 0402



_______________________________________________
Hyperledger-fabric mailing list
Hyperledger-fabric@...
https://lists.hyperledger.org/mailman/listinfo/hyperledger-fabric



--
Best wishes!
Baohua

_______________________________________________
Hyperledger-fabric mailing list
Hyperledger-fabric@...
https://lists.hyperledger.org/mailman/listinfo/hyperledger-fabric





--
Best wishes!
Baohua


_______________________________________________
Hyperledger-fabric mailing list
Hyperledger-fabric@...
https://lists.hyperledger.org/mailman/listinfo/hyperledger-fabric


-- 
Brian Behlendorf
Executive Director at the Hyperledger Project
bbehlendorf@...
Twitter: @brianbehlendorf

Join fabric@lists.hyperledger.org to automatically receive all group messages.