[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: SteveKing <stefankueng_at_gmail.com>
Date: 2004-12-14 13:24:05 CET

On Tue, 14 Dec 2004 13:13:04 +0100 (CET), Nicklas Norling
<exinor@exinor.net> wrote:

> 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?

One file is your original file before you modified it in your working copy
One file is the file from the repository
One file is the with the conflict overlay which is your modified file.

> 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?

Well, that depends. You marked the files as binary, so Subversion only
'created' three conflicting files (see above). If you had set a text
mimetype, then Subversion would have created four files. And those
four files is what TMerge needs for a three way merge.

> 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).

TMerge doesn't check the Subversioin mime-types. It only tries to read
the files as text and if that fails assumes they're binary.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
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: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.