Re: Confused about how to merge changes from branch to trunk

On 9/26/2013 10:13 AM, Quoth Ian L:
> So I merged all the changes from trunk into my branch working copy. I
> think committed all of that to the branch.

When you did this merge, it should have shown a property change for
svn:mergeinfo on the folder where you did the merge (which should have
been the root of your working copy -- while it's possible to merge
elsewhere, it gets messy, so it's best to always do merges at the root).

You need to make sure that you commit this along with the actual changes.

You also need to make sure that your server is running SVN 1.5 or later.

> I then checked out a copy of trunk and went to do a merge a range of
> revisions. I select revisions 154, 159 and 160 (160 is the commit to
> the branch of all the code i got from trunk)

While TSVN would normally say that it's merging revision 160, it should
not actually change any files when doing so -- this is because the
mergeinfo property tells it that this revision came from the trunk and
does not need to be merged.

(It doesn't quite actually work that way but that's the easiest way to
think of it.)

The problems you're having sounds like the mergeinfo property may not
have been committed when you did the original merge.

Also, when merging from a branch back to trunk typically you would just
leave the box blank to merge all revisions. The only reason to
cherry-pick is when merging individual bugfixes to a release branch or
if you want to pull a bugfix from a branch before the complete feature
has been finished.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3065271

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-26 02:16:36 CEST