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

svn merge --dry-run produces message instead of saying A dir if dir is missing

From: Francois Beausoleil <fbos_at_users.sourceforge.net>
Date: 2003-10-02 03:19:36 CEST

Hello everyone !

I believe I found a little bug in merge --dry-run. The following recipe
exposes the problem:

rd /s/q repos wc
svnadmin create repos
svn checkout file:///repos wc
cd wc
svn mkdir trunk tags branches
cd trunk
echo File A's content >filea.txt
svn add filea.txt
cd ..
svn commit --message "Created base layout"
svn copy --message "Created branch to work on" file:///repos/trunk
file:///repos/branches/testing
svn update
cd branches\testing
echo File B's content >fileb.txt
svn add fileb.txt
svn mkdir dirB
echo File dirB/C's content >dirB\filec.txt
svn add dirB\filec.txt
svn commit --message "Created new file"
cd ..\..\trunk
svn merge --dry-run --revision 2:3 file:///repos/branches/testing
svn merge --revision 2:3 file:///repos/branches/testing

The last two commands return the following:
K:\wc\trunk>svn merge --dry-run --revision 2:3
file:///repos/branches/testing
A fileb.txt
A dirB
Skipped missing target: dirB\filec.txt

K:\wc\trunk>svn merge --revision 2:3 file:///repos/branches/testing
A fileb.txt
A dirB
A dirB\filec.txt

As you can see, the svn merge --dry-run returned a message saying the
folder did not exist. Not a problem in itself, but it would have been
better if it had simply returned the exact same messages as a plain svn
merge.

I believe a test case is in order here. Can someone acknowledge that
this is a bug, and then I'll take a look at extending the test suite to
add such a test. Maybe it should be XFail for the moment ? I don't
know. At the very least, a bug report should be filed. I searched the
issues database, but could not find anything.

Environment: Win2K SP4
K:\>svn --version
svn, version 0.30.0 (r7178)
   compiled Sep 24 2003, 20:10:05

Using ra_dav produces the same output, if that is significant.

Thanks !
François

PS: I attached the test case too, since my mailer will word-wrap the
test case. Rename it to .bat to execute.
Developer of Java Gui Builder
http://jgb.sourceforge.net/

rd /s/q repos wc
cls
svn --version
svnadmin create repos
svn checkout file:///repos wc
cd wc
svn mkdir trunk tags branches
cd trunk
echo File A's content >filea.txt
svn add filea.txt
cd ..
svn commit --message "Created base layout"
svn copy --message "Created branch to work on" file:///repos/trunk file:///repos/branches/testing
svn update
cd branches\testing
echo File B's content >fileb.txt
svn add fileb.txt
svn mkdir dirB
echo File dirB/C's content >dirB\filec.txt
svn add dirB\filec.txt
svn commit --message "Created new file"
cd ..\..\trunk
svn merge --dry-run --revision 2:3 file:///repos/branches/testing
svn merge --revision 2:3 file:///repos/branches/testing

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 2 03:20:28 2003

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.