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

RE: MERGE: Command Line Results Different from TortoiseSVN Results

From: Gavin Lambert <colnet_at_mirality.co.nz>
Date: Thu, 15 Jan 2015 14:14:49 -0800 (PST)

On 16/01/2015 08:25, Marcia Almeida Rocha quoth:
> Branches/1.0 is created based on trunk and in this moment merges are
> done from trunk to 1.0 when revisions are approved.
> When 2.0 starts, the branch 1.0-work is created based on trunk , but
> some revisions from trunk are not already merged to branches/1.0. So
> they will merge later from 1.0-work to 1.0.
> When I do merge from 1.0-work to 1.0 using TSVN, I have to uncheck
> option stop on copy/renamed in order to see those revisions that were
> not merged yet to 1.0.

In general, it is not a good idea to merge unrelated/sibling branches. You *can* do it if you're careful, and they do get tracked, but it creates quite a mess.

You should try to always merge between parent & child branches only, never to siblings or grandparents/children.

So with the above layout, never merge between 1.0-work and 1.0 -- merge 1.0-work to trunk and then trunk to 1.0.

Alternatively, you should change your practices such that you create 1.0-work from trunk and then 1.0 from 1.0-work. Then the merges will flow more naturally.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-15 23:14:53 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.