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

[TSVN] Odd merge?

From: Nicklas Norling <exinor_at_exinor.net>
Date: 2004-12-14 13:13:04 CET


In my best efforts of testing I today created a file with mime-type
application/octet-stream (binary that is) to see how it behaved when I
created a conflict.
The file in question is called Fndbas.cat and exists in r1 and then I add
a new r2 revision and a conflicting change in my other WC where I run
update. I get a warning about the conflict. In the folder I have three
files, Fndbas.cat with a conflict marker on it, Fndbas.cat.r1 and
Fndbas.cat.r2. What do I need those for? If there is a conflict between my
file and what's in svn isn't it enough with my file and .r2?

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

I was expecting to see a three-way diff as I had three files. Or I was
expecting to see r2 on the left and my file on the right with options to
select any text from any side.
As a variation I would have accepted a dialog telling that the files are
marked as binary and should not be merged using the merge tool, but if I
insist... I can do it anyway (for those text-based 'unmergable' files).


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Dec 14 13:14:36 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.