Re: Merge Conflict Callback Dialog does NOT show during Reintegrate a branch

Hi,

In which release of TortoiseSVN the bug (fixed in r14439) will be
integrated?

Regards,

jml

Stefan Kueng wrote:
>
> Bernhard Merkle wrote:
>> 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 ?
>
> http://nightlybuilds.tortoisesvn.net/latest/changelog.html#r14439
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
>
>
>

-- 
View this message in context: http://www.nabble.com/Merge-Conflict-Callback-Dialog-does-NOT-show-during-Reintegrate-a--branch-tp20338927p21075577.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=986783
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].