If we a team commit our changes/merges, than the log window opened from the merge dialog shows grey log entries for the committed changes and black for the changes waiting to get merged.
I'm using TSVN since 1.5 and had always this behavior.
Regards,
Martin
------- Original message -------
> From: Gavin Lambert <colnet_at_mirality.co.nz>
> To: users_at_tortoisesvn.tigris.org
> Sent: 8.7.'14, 1:00
>
> 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].
Martin Lemburg
Emdener Straße 19A
10551 Berlin
Deutschland
+49 179 3954095 Mob.
+49 30 39037205 Tel.
+49 3212 LEMBURG
martin.lemburg_at_gmx.net
http://about.me/Martin0815
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084746
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-08 07:49:31 CEST