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

Re: [TSVN] Odd merge?

From: Nicklas Norling <exinor_at_exinor.net>
Date: 2004-12-14 17:22:15 CET

Rainer Müller wrote:

> Nicklas Norling wrote:
>>>> I use TSVN 'Edit Conflicts' on Fndbas.cat and after a bit of loading I
>>>> end
>>>> up with two windows; the left containing Fndbas.cat.r1, the right
>>>> containing r2.
>>>> On the left I can only select 'Use this text' and on the right the
>>>> only
>>>> options are to select 'Use other text'. Is this the way it's
>>>> supposed to
>>>> work?
>> [...]
>> I think you missed my point here. I'm not seeing my changes. I'm seeing
>> the 'original from before I modified my wc' and the version from the
>> repo.
>> Not a singel bit of my changes are displayed. Also I'm only allowed to
>> select code from the 'original from before I modified my wc'. Isn't this
>> just a very complicatied way of doing revert?
> There was a bug in builds prior to revision 1970 with the context menu.
> You have to use a unstable nightly build to have this fixed.
> Rainer

I was using the latest nightly.

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Dec 14 17:24:47 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.