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

Merge back feature branch with old 1.4 server fails since TortoiseSvn 1.6.8

From: Ivo Sieben <ivo.sieben_at_nbg-industrial.nl>
Date: Wed, 18 Aug 2010 14:22:46 +0200



Since TortoiseSvn 1.6.8 we have an issue with reintegrating a feature

We use an old server version 1.4.2 so we don't have merge tracking.

For this reason I cannot use the "reintegrate a brach" option, but I use
the "Merge two different trees" option.


When I reintegrate a feature branch this way, it works fine with
TortoiseSvn 1.6.7

But the merge result is incorrect with TortoiseSvn 1.6.8 or later (also
tried it with 1.6.10)


At first the merge works fine, with a message such as:

- "Merging from https://MyServer/MyProject/trunk, revision 9266
to https://MyServer/MyProject/branch_ftr/UvCoolingOnStart, revision HEAD
into C:\LSW\WKS\ISi\MPM_trunk\Head, respecting ancestry"


However since TortoiseSvn 1.6.8 two addional steps are done which mess
up the merge, causing a lot of conflicts and reverting changes that
shouldn't be reverted:

- "Merging r9185 through r9276 C:\LSW\WKS\ISi\MPM_trunk\Head"

- "Reverse merging 92665 through 9185"


Note that:

- Revision 9185 is the creation revision of the feature branch

- Revision 9276 is the HEAD revision of the feature branch


See also the attached screenshots

I tried to see if this is a known conflict, but I cannot find any
results on that.
I hope someone on this e-mail list can help me out here, for now I'm
stuck to version 1.6.7 because we use feature branching a lot.



Ivo Sieben


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2010-08-18 14:29:40 CEST

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.