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

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

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-08-09 20:26:04 CEST

On Sun, 2004-08-08 at 14:38, François Beausoleil wrote:
> Hi !
>
> The repro recipe below illustrates the problem (sample run at end):

I'm using an svn-1.1 client on RH9, and I can't reproduce. Can you try
a 1.1 client on win32, and see if the bug is still there?

-----------------------------------------------

[sussman@kepler:~/scratch]$ svnadmin create repos
[sussman_at_kepler:~/scratch]$ svn co file://`pwd`/repos wc
Checked out revision 0.
[sussman@kepler:~/scratch]$ cd wc
[sussman@kepler:~/scratch/wc]$ mkdir trunk branches
[sussman@kepler:~/scratch/wc]$ cd trunk
[sussman@kepler:~/scratch/wc/trunk]$ echo "this is a test" > file.txt
[sussman@kepler:~/scratch/wc/trunk]$ cd ..
[sussman@kepler:~/scratch/wc]$ svn add trunk/ branches/
A trunk
A trunk/file.txt
A branches
[sussman@kepler:~/scratch/wc]$ svn ci -m "test"
Adding branches
Adding trunk
Adding trunk/file.txt
Transmitting file data .
Committed revision 1.
[sussman@kepler:~/scratch/wc]$ svn cp trunk/ branches/1.x
A branches/1.x
[sussman@kepler:~/scratch/wc]$ svn ci -m "test"
Adding branches/1.x
 
Committed revision 2.
[sussman@kepler:~/scratch/wc]$ cd trunk
[sussman@kepler:~/scratch/wc/trunk]$ echo "this is another test" > file2.txt
[sussman@kepler:~/scratch/wc/trunk]$ svn add file2.txt
A file2.txt
[sussman@kepler:~/scratch/wc/trunk]$ cd ..
[sussman@kepler:~/scratch/wc]$ svn ci -m "test"
Adding trunk/file2.txt
Transmitting file data .
Committed revision 3.
[sussman@kepler:~/scratch/wc]$ cd branches/1.x/
[sussman_at_kepler:~/scratch/wc/branches/1.x]$ svn merge -r1:head file:///home/sussman/scratch/repos/garble
subversion/libsvn_fs_base/tree.c:379: (apr_err=160013)
svn: File not found: revision 3, path '/garble'
[sussman_at_kepler:~/scratch/wc/branches/1.x]$ svn merge -r1:head file:///home/sussman/scratch/repos/garble/garfunkle/terry
subversion/libsvn_fs_base/tree.c:379: (apr_err=160013)
svn: File not found: revision 3, path '/garble/garfunkle/terry'
[sussman_at_kepler:~/scratch/wc/branches/1.x]$ svn merge -r1:head file:///home/sussman/scratch/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 Mon Aug 9 20:27:10 2004

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