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

Merging questions

From: Simon McClenahan <smcclenahan_at_healthcompartners.com>
Date: 2004-04-20 19:00:06 CEST

I have a Subversion server still at 0.37 , and TortoiseSVN 1.0.3 build 968. I checked out a WC of my trunk, and used the Merge command to merge in a branch.

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

The .java file has "<<<<<<< .working", "=======", and ">>>>>>> .merge-right.r214" tags in it, making the source unusable.
The .merge-right file has the updated changes that I want.
The .working file has the old stuff I want to merge into.

The documentation for TortoiseSVN in 4.7 Resolving Conflicts refers to filename*.mine and filename*.r* files

Are these issues because of the SVN server being 0.37? How do I undo what just happened, do I have to checkout the trunk again?

- Simon

NOTE: This message and any included attachments are from HealthCom Partners, LLC and are intended only for the addressee(s). The information contained herein may include trade secrets or privileged or otherwise confidential information. Unauthorized review, forwarding, printing, copying, distributing, or using such information is strictly prohibited and may be unlawful. If you received this message in error, or have reason to believe you are not authorized to receive it, please promptly delete this message and notify the sender by e-mail.

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:00:51 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.