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

svn merge doesn't show a conflict

From: Jens Seidel <jensseidel_at_users.sourceforge.net>
Date: 2006-08-04 09:51:54 CEST

Hi,

I noticed that svn merge doesn't show a conflict if it adds a conflicting
file. The merge outputs
A file
instead of the expected
C file
whereas svn status shows
? file.merge-left.r0
? file.merge-right.r3
? file.working
C file

This is probably the same problem as in
http://svn.haxx.se/users/archive-2006-07/0038.shtml (svn status doesn't show a
conflict) which was solved in r20382.

It can be reproduced using:

$ svnadmin create repos
$ R=$(pwd)/repos
$ svn co file://$R wc
Checked out revision 0.
$ cd wc
$ svn mkdir devel branch
A devel
A branch
$ svn ci -m "added directories"
Adding branch
Adding devel

Committed revision 1.

# Adding devel/file
$ echo hello > devel/file
$ svn add devel/file
A devel/file
$ svn ci -m "added devel/file"
Adding devel/file
Transmitting file data .
Committed revision 2.

# Adding branch/file
$ echo hello2 > branch/file
$ svn add branch/file
A branch/file
$ svn ci -m "added branch/file"
Adding branch/file
Transmitting file data .
Committed revision 3.

# now lets merge
$ cd devel/
$ svn merge -r 2:3 file://$R/branch
A file
$ svn status
? file.merge-left.r0
? file.merge-right.r3
? file.working
C file

I'm using 1.4.0 (Release Candidate 4).

Jens

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 4 09:55:34 2006

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.