[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: Frodak Baksik <frodak17_at_gmail.com>
Date: 2007-02-14 23:07:34 CET

On 2/14/07, Phillip Susi <psusi@cfl.rr.com> wrote:
> Frodak Baksik wrote:
> > I've just tried this out. The branch doesn't exist in r1, but only in
>
> svn ls file:///svn/branch -r1 works for me. It shows the contents of
> trunk as of r1, since that was the state of branch in r1, before it was
> copied. You may also try diff instead of ls. The diff fails with r2
> and r3, but works with r1.

How are you using diff?

>
> > r4. From the svn log --help output: "Logs follow copy history by
> > default." This can be changed by using the --stop-on-copy option.
> > Verify this using the ls -R command at different revisions. It'll
> > only show branch in r4.
>
> Not sure why you mention --stop-on-copy, but again, an svn ls -r1
> file:///svn/branch DOES work for me. It only fails with -r2 or -r3.
> You seem to be performing an ls on the root directory, which of course,
> shows no branch in -r1 because it wasn't there in r1, but an ls on the
> branch itself with -r1 works because the branch did exist in r1, just at
> a different path.

I mention it because I don't know how you determined that branch
exists in revision 1.

$ svn ls file:///svn/repo/branch_at_1
svn: URL 'file:///svn/repo/branch' non-existent in that revision

$ svn ls file:///svn/repo/branch_at_2
svn: URL 'file:///svn/repo/branch' non-existent in that revision

$ svn ls file:///svn/repo/branch_at_3
svn: URL 'file:///svn/repo/branch' non-existent in that revision

$ svn ls file:///svn/repo/branch_at_4
trunk/

To me this indicates that file:///svn/repo/branch only exists in revision 4.

$ svn ls -r1 file:///svn/repo/branch
trunk/

Which is the same as:

$ svn -r1 ls file:///svn/repo/branch_at_4
trunk/

The SVN book states that in this case svn will find branch as it
exists in version 4 and trace it back through any renames until
revision 1.

$ svn -r2 ls file:///svn/repo/branch_at_4
svn: Unable to find repository location for 'file:///svn/repo/branch'
in revision 2

This makes sense because branch is a copy of trunk version 1.

> If the branch exists in r4, and did exist in r1 ( under a different path
> ) then how can it not exist in r2 or r3? That is the problem. You
> should be able to retrieve the state of a file at any revision between
> the time it was created ( even if it has since been copied or renamed )
> and HEAD, but in this case, you can not.
>

I disagree with this statement. I should only be able to retrieve the
state of a file at any revision where it exists. Branch only exists
in revisions 4 (when it was actually created) and 1 (because that is
the source of the copy).

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 14 23:08:12 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.