On 8/4/06, Jens Seidel <jensseidel@users.sf.net> wrote:
> 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).
This is a known problem. I can't commit the fix for it because it
breaks other things (specifically dry-run merges), see the following
issue for the details:
http://subversion.tigris.org/issues/show_bug.cgi?id=2584
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 4 15:55:54 2006