[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 14:01:15 CET

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

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

Yes I know. The point is: TMerge expects the four files Subversion
creates with conflicting text files, but you passed only three files
to it which are created for binary files. So the "theirs, yours, mine,
..." is not recognized correctly by TMerge. That's why there's no
three way merge, that's why you see the 'wrong' files in the left and
right view.

> > 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.
> Maybe it should take mime-type application/* into account? It would be
> consistent with e.g. 'Show Differences as Unified diff' (from Log message
> window RMB):

You see, TortoiseMerge isn't linked with the full Subversion library,
only with libsvn_diff. So checking the mime-type would require to link
against the full library.

> At the very least it should allow me to diff what's in the repo with what
> I've edited, don't you think?

I'll think of a way to do this automatically when choosing "edit
conflicts", but in the meantime, select the file with the conflicted
icon and the one with the higher .rXXX number, then choose "diff" from
the TSVN context menu.


  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 14:01:56 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.