2008/6/18 Robert Dailey <rcdailey_at_gmail.com>:
> On Wed, Jun 18, 2008 at 3:23 PM, Cory Trese <cory.trese_at_gmail.com> wrote:
>>
>>
>> On Wed, Jun 18, 2008 at 3:55 PM, Robert Dailey <rcdailey_at_gmail.com> wrote:
>>>
>>> Hi,
>>>
>>> I remember in TSVN 1.4 there was a button in the Merge dialog to view the
>>> differences of the merge, so you could view the conflicts in a file before
>>> actually performing the merge. I fail to see this feature in 1.5. Was it
>>> removed? Or is there a different way of doing this?
>>
>> The TSVN 1.4 feature I use for this is "Dry Run." I believe it is still
>> in 1.5
>
> Well, it's been a while since I've used 1.4, so I apologize if I'm being
> incorrect. I believe "Dry Run" simply showed you what would conflict, and
> what would merge. However, there was yet another option that would allow you
> to view the differences between two files that will be merged or conflicted.
> This would bring up TortoiseDiff and you could see each individual change in
> the source file in comparison to your branch copy. I do not see a way of
> doing this in the merge dialog in 1.5.
>
Previously you could diff the two URL+revisions being merged. However,
this will no longer be a reflection of what happens in the merge now
that merge tracking is in use, so I'm not sure there is an equivalent
in 1.5
Simon
--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-18 22:37:45 CEST