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

Re: Merging questions

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-04-20 19:09:37 CEST

Please, please, mail tortoise questions to that project's dev list. :-)

On Tue, 2004-04-20 at 12:00, Simon McClenahan wrote:

> I have a lib directory full of binary files, and the result of the merge seemed to think that there were a lot of differences, even though there were none. I have source code text files that were different, but when I use TortoiseMerge, all I see is red for the whole file and no specific differences. For each file that is changed, I get the following files -
> 04/20/2004 10:45 AM 16,616 NotifyChangeAccountEJBHome.java
> 04/20/2004 10:45 AM 0 NotifyChangeAccountEJBHome.java.merge-left.r0
> 04/20/2004 10:45 AM 8,540 NotifyChangeAccountEJBHome.java.merge-right.r214
> 04/20/2004 10:45 AM 8,022 NotifyChangeAccountEJBHome.java.working

Binary files *should not* be merged. When you add a binary file to a
project, the svn commandline notices this and sets the 'svn:mime-type'
property to 'application/octet-stream'. If TortoiseSVN didn't do this
for you, then that's a Tortoise bug.

When 'svn merge' sees the binary mime-type property, it doesn't attempt
to do any contextual merging. It just creates three fulltext files,
rather than trying to insert conflict markers. If TortoiseSVN's merge
command isn't doing this, then that's a TortoiseSVN bug.

I can't speculate any more, because I (and most developers on this list)
don't know the Tortoise UI very well, and don't know it's internals. I
would repost your question to the tortoisesvn dev list.

> Are these issues because of the SVN server being 0.37?

No, merging is purely a client-side behavior. The server is irrelevant.

> How do I undo what just happened, do I have to checkout the trunk again?

If you don't like the results of a merge, just 'revert' all the local
mods, remove any unversioned files left behind, and re-run the merge in
a different way.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 20 19:12:17 2004

This is an archived mail posted to the Subversion Users mailing list.

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