Re: Re: Merge log and natural history

Dear Gavin,

thanks for your clarification!

Regards,

Martin

On Tue, 08 Jul 2014 08:03:11 +0200, Gavin Lambert <colnet_at_mirality.co.nz>
wrote:

> Quoth Martin Lemburg:
>> 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.
>
> I think you've misunderstood what I'm referring to.
>
> If branch B was created from trunk at rev 1000, and then I cherry-pick
> rev 1020 into branch B, then when I go back to the merge log (from
> branch B, looking at trunk) then rev 1020 is greyed out as expected,
> which is what you're referring to.
>
> However rev 1000 and earlier on trunk should *also* be greyed out
> (because they predate branch creation, and therefore exist in both
> branches already), and this does not occur. That's what I'm referring
> to.
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084747
>
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe_at_tortoisesvn.tigris.org].

-- 
Martin Lemburg
Emdner Straße 19A
D-10551 Berlin
T: +49 30 39037205
M: +49 179 3954095
F: +49 3121 LEMBURG
http://about.me/Martin0815
martin.lemburg_at_gmx.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084754
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].