[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Cherry pick file moves (and modifications) from Trunk into branch

From: Stefan Hett <stefan_at_egosoft.com>
Date: Fri, 3 Feb 2017 13:37:09 +0100

On 2/1/2017 4:54 PM, Charles Wilt wrote:
> Is it possible to cherry pick files from the trunk down into an older release branch that have been modified and moved in the trunk?
> My initial attempt succeeded in getting the changes down, but I couldn't get the moves down. I ended up just moving them manually in the branch. (hope that works) I think I went wrong committing changes before merging the move...
> But I've got another release branch that need the same changes & moves. So I thought I'd see if there was a recommend method of doing what I want to do.
Things should improve with (T)SVN 1.10 in this scenario. However atm
merging revisions containing moved files from A -> B involves manually
resolving the tree conflicts.
If you didn't get a tree conflict when you did the merge, something
might be messed up with the branch set up on your side or you didnot
merge the revision which moved/renamed the file.

In general the recommended process differs on the actual needs. I'd
always prefer to have things cleanly tracked between branches (but this
might not be suitable for others/different environments/repo
structures). If you want to follow the same pattern however:
1. merge the revision from trunk to the branch which contained the
move/rename of the file
2. merge the revision of the modification from trunk on the then moved file

Stefan Hett
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-02-03 13:37:58 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.