You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by François Beausoleil <fb...@ftml.net> on 2004/08/08 19:38:25 UTC
[BUG] Merge doesn't report error if URL doesn't exist
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
Re: [BUG] Merge doesn't report error if URL doesn't exist
Posted by François Beausoleil <fb...@ftml.net>.
Hello Ben,
Ben Collins-Sussman wrote:
> 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?
>
$ svn --version
svn, version 1.1.0 (Release Candidate 1)
compiled Jul 19 2004, 09:03:26
...
$ svn merge -r1:head file:///D:/scratch/repos/garble
svn: File not found: revision 3, path '/garble'
$ svn merge -r1:head file:///D:/scratch/repos/garble/garfunkle
svn: File not found: revision 3, path '/garble/garfunkle'
$ svn merge -r1:head file:///D:/scratch/repos/garble/garfunkle/terry
svn: File not found: revision 3, path '/garble/garfunkle/terry'
$ svn merge -r1:head file:///D:/scratch/repos/trunk
A file2.txt
Confirmed, does not reproduce.
Sorry for the noise.
Thanks !
François
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: [BUG] Merge doesn't report error if URL doesn't exist
Posted by Ben Collins-Sussman <su...@collab.net>.
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@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@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@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@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