Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [git] repo-layout question: cross-repo cherry-picking? 
On Mon, Nov 21, 2011 at 9:12 AM, Stephan Herrmann
<stephan@xxxxxxxxxxxxxxx> wrote:
> Now cherry-picking works, but EGit's history shows the moved version
> as having no history. Is there a way to tell EGit to follow moves? If that's
> possible, is it advisable to move a whole project so every history lookup
> will require matching all those files across different paths?
> To me this sounds more fragile than a move was in svn - am I missing
> anything?

Cherry picking doesn't include anything from the original history.

If you cherry pick with the '-x' parameter you'lll get a message that
includes the SHA1 where it came from. But the cherry picked commit of
course will get a new SHA1.

      -x
           When recording the commit, append to the original commit
message a note that indicates which commit this
           change was cherry-picked from. Append the note only for
cherry picks without conflicts. Do not use this
           option if you are cherry-picking from your private branch
because the information is useless to the
           recipient. If on the other hand you are cherry-picking
between two publicly visible branches (e.g.
           backporting a fix to a maintenance branch for an older
release from a development branch), adding this
           information can be useful.

On a side note, I think it would be in your best interest to take the
JDT fork and apply your changes on top of it so you share the same
history. I hope you don't end up in a case where there's a different
history up to the first commit. This may be a bit more painful on your
end but will help you in the long run to catch up with JDT.

-- 
Cheers,

Chris Aniszczyk
http://aniszczyk.org
+1 512 961 6719

Back to the top