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

Re: Branch causes missing revs and errors merging

From: Phillip Susi <psusi_at_cfl.rr.com>
Date: 2007-02-13 23:48:24 CET

Ryan Schmidt wrote:
>> Another way to duplicate this problem is to copy a branch from a
>> version other than HEAD. For instance, if HEAD is at 7, and you svn
>> copy -r 4 /repo/trunk /repo/branch, then the revisions 5, 6, and 7 can
>> not be found in /repo/branch, but 4 can be.
>
> I'm having trouble following all this, and it would be easier if you
> could provide a series of svn commands, starting from creating a new
> empty repository, ending with the output that you think is wrong, so
> that we can try that same set of commands to see what's going on.

I believe the commands I used were something like this:

svnadmin init /repo
svn checkout /repo
mkdir trunk
echo foo > trunk/foo
svn add trunk
svn commit
svn update
echo bar > trunk/bar
svn add trunk/bar
svn commit
echo baz > trunk/baz
svn add trunk/baz
svn commit
svn update -r1
svn copy . /repo/branch

At this point the repository head is at rev 4 but you have a branch
forked off from rev 1. An svn ls /repo/branch works, but then fails (
saying the path can not be found ) if you add a -r3 or -r2, then works
again with -r1.

If /repo/branch can be found in HEAD, and has history that traces back
to rev 1 ( run an svn log on it and it shows the history all the way
back to r1 ), then you should be able to find it in all revs between 1
and HEAD.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 13 23:49:03 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.