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

[BUG] maybe - svn backwards merge with binary file

From: Joshua Varner <jlvarner_at_gmail.com>
Date: 2005-08-26 21:23:04 CEST

I was trying to reproduce a bug that was reported a bit ago:

I couldn't reproduce this problem, until I accidentally tried to do an
'svn merge TRUNK BRANCH' while in a branch working copy.
This gave the behavior described, i.e. the merge issues no errors
but I have the diff conflict files, and subsequent commands
report that I have an unresolved issue.

Now, this seems to be a bug, but I can only reproduce it by
intentionally screwing up so I don't know how important this
is, or if it should just be considered user error. If I should add
this to the Issue Tracker let me know.

Below is a transcript and I attached a script to reproduce.

[josh@lcc51 sandbox]$ rm -rf *; ../bug-recipe
+ svnadmin create test-repos
++ cd test-repos/
++ pwd
+ export REPO=/work/test/svn/sandbox/test-repos
+ REPO=/work/test/svn/sandbox/test-repos
+ mkdir test-import test-import/trunk test-import/branches
+ echo A file
+ cd test-import/
+ svn import file:////work/test/svn/sandbox/test-repos -m 'Initial import'
Adding trunk
Adding trunk/file
Adding branches

Committed revision 1.
+ svn cp file:////work/test/svn/sandbox/test-repos/trunk
file:////work/test/svn/sandbox/test-repos/branches/br1 -m Branching

Committed revision 2.
+ svn co file:////work/test/svn/sandbox/test-repos/branches/br1 test-wc
A test-wc/file
Checked out revision 2.
+ cd test-wc
+ echo New File
+ svn add file2
A file2
+ svn propset svn:mime-type image/jpg file2
property 'svn:mime-type' set on 'file2'
+ svn merge file:////work/test/svn/sandbox/test-repos/trunk
+ svn commit -m 'Added file'
Adding (bin) file2
Transmitting file data .
Committed revision 3.
+ svn merge file:////work/test/svn/sandbox/test-repos/trunk
A file2
+ ls -l
total 12
-rw-rw-r-- 1 josh josh 7 Aug 26 14:19 file
-rw-rw-r-- 1 josh josh 9 Aug 26 14:19 file2
-rw-rw-r-- 1 josh josh 0 Aug 26 14:19 file2.merge-left.r0
-rw-rw-r-- 1 josh josh 9 Aug 26 14:19 file2.merge-right.r3
+ svn status
? file2.merge-left.r0
? file2.merge-right.r3
C file2

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Fri Aug 26 21:23:40 2005

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

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