[Insight-developers] Gerrit adding unexpected dependencies
Bill Lorensen
bill.lorensen at gmail.com
Sun Nov 13 08:10:33 EST 2011
Folks,
I was reviewing a gerrit topic: http://review.source.kitware.com/#change,3086
I proceeded as I have been for months:.
1) git checkout master
2) git checkout -b QuasiNewtonObjectOptimizer
3) git fetch http://review.source.kitware.com/p/ITK
refs/changes/86/3086/3 && git cherry-pick FETCH_HEAD
4) There was a conflict so I fixed the conflict
5) git add "conflicted file"
6) git commit -c FETCH_HEAD
7) git gerrit-push
For some reason I see this merge patch on gerrit
http://review.source.kitware.com/#change,3299
and several other gerrit patches with the same topic name
QuasiNewtonObjectOptimizer.
Has something changed in gerrit? I'm pretty sure I did what I usually
do with gerrit and conflict resolution.
Bill
--
Unpaid intern in BillsBasement at noware dot com
More information about the Insight-developers
mailing list