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

[BUG] Merge doesn't report error if URL doesn't exist

From: François Beausoleil <fbeausoleil_at_ftml.net>
Date: 2004-08-08 21:38:25 CEST

Hi !

The repro recipe below illustrates the problem (sample run at end):

rd /s/q repos wc
cls
svn --version
svnadmin create repos
svn co file:///repos wc
cd wc
md trunk branches
cd trunk
echo this is a test >file.txt
cd ..
svn add trunk branches
svn ci -m "test"
svn cp trunk branches/1.x
svn ci -m "test"
cd trunk
echo this is another test >file2.txt
svn add file2.txt
cd ..
svn ci -m "test"
cd branches/1.x
svn merge -r1:head file:///repos/garble
svn merge -r1:head file:///repos/garble/garfunkle
svn merge -r1:head file:///repos/garble/garfunkle/terry
svn merge -r1:head file:///repos/trunk

Only the last merge works, the other ones do not report an error. They
also do nothing. Is that expected ?

I've found issue 1249 (svn merge between
similar-but-ancestrally-unrelated dirs into a third similar dir fails.),
but I don't think it is related in any way.
http://subversion.tigris.org/issues/show_bug.cgi?id=1249

This is with Subversion 1.0.6 on WinXP SP1.

Bye !
François

===============================================

$ svn --version
svn, version 1.0.6 (r10360)
    compiled Jul 24 2004, 00:01:41
...

$ svnadmin create repos

$ svn co file:///repos wc
Checked out revision 0.

$ cd wc

$ md trunk branches

$ cd trunk

$ echo this is a test 1>file.txt

$ cd ..

$ svn add trunk branches
A trunk
A trunk\file.txt
A branches

$ svn ci -m "test"
Adding branches
Adding trunk
Adding trunk\file.txt
Transmitting file data .
Committed revision 1.

$ svn cp trunk branches/1.x
A branches\1.x

$ svn ci -m "test"
Adding branches\1.x

Committed revision 2.

$ cd trunk

$ echo this is another test 1>file2.txt

$ svn add file2.txt
A file2.txt

$ cd ..

$ svn ci -m "test"
Adding trunk\file2.txt
Transmitting file data .
Committed revision 3.

$ cd branches/1.x

$ svn merge -r1:head file:///repos/garble

$ svn merge -r1:head file:///repos/garble/garfunkle

$ svn merge -r1:head file:///repos/garble/garfunkle/terry

$ svn merge -r1:head file:///repos/trunk
A file2.txt

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Aug 8 21:38:43 2004

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