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

Files marked "U" after svn merge do not merge properly

From: Ted Sheibar <thinkpipes_at_gmail.com>
Date: Wed, 28 Oct 2009 16:39:36 -0700

Hello,

--- PROBLEM
After using svn merge, some files marked as "U" did not merge.

--- STEPS
Merging Branch 2.0 into 2.1:
1) Checked out 2.1 from HEAD (328)
2) Dry-run from 2.0 -r 275:301
3) Full merge, resolved from 2.0
4) Ran svn diff against files marked "U" that were resolved from 2.0
5) Diff showed differences in some "U" files, but not all

--- USER INFO
Operating system -- Linux 64-bit: 2.6.18-128.el5xen x86_64 GNU/Linux
Svn release;: 1.6.5 (server is 1.4.3)
No compilation/configuration options - used pre-packaged binary.
Using FSFS
Pretty standard setup

Please let me know if this is expected behavior, as it looks like a bug.

Thanks

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2412328

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-29 00:40:39 CET

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