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

Merge log and natural history

From: Gavin Lambert <colnet_at_mirality.co.nz>
Date: Mon, 7 Jul 2014 16:00:38 -0700 (PDT)

I dimly recollect that somewhere back around TSVN 1.3 or so, looking at the Log from a Merge window would grey out the "natural history" of the branch (aka all revisions from the source branch prior to the branch creation point), indicating that they're non-mergeable.

I'm not sure exactly when it stopped doing this, but as of 1.8.7 it's still missing. Any chance we could get this behaviour back?

On a semi-related note, I've noticed that the information printed by the Test Merge button is completely different from what the command-line client prints on --dry-run (and much less helpful, in that it reports modifies and conflicts from revisions that won't even get merged as a result of the merge history).

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-08 01:00:46 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.