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

Merge Conflict Callback Dialog does NOT show during Reintegrate a branch

From: Bernhard Merkle <bernhard.merkle_at_googlemail.com>
Date: Wed, 5 Nov 2008 02:04:06 -0800 (PST)

Hi,

I think $subject already explains this issue a bit. Tested with the
newest TTSVN release 1.5.5

IMO the Merge Conflict Callback Dialog should come up
- when merging multiple revisions via "Merge a range of revisions"
- when merging via "Reintegrate a branch"

at the moment the Merge Conflict Callback Dialog only comes up in the
first case.

conceptually the use cases do not differ regarding the conflict issue,
so why is there no dialog in the second case ?

thanks and kind regards,
Bernhard.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-11-05 11:05:36 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.