[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-15 22:19:48 CET

On 2/15/07, Phillip Susi <psusi@cfl.rr.com> wrote:
> Frodak Baksik wrote:
> > No, I actually did try it. Please re-read your directions on setting
> > up the repository.
> > Your example starts with a checkout the root directory of the repos,
> > you create trunk and some files within truck, and then copy the WC to
> > /branch. That is what I did. Therefore you will get trunk as a
> > subdirectory of branch.
>
> Sorry, I made a typeo. That should have been copy trunk to branch, not
> the root.
>
> > But that is immaterial to the discussion. We are both in agreement
> > that the contents of branch exist in revision 1 and that branch exists
> > in revision 4. We disagree about revs 2 and 3.
>
> Yes.
>
> > I do understand the difference and I understand what you are trying to
> > say. Personally I don't think it is an issue, sorry.
>
> Do you disagree that an object should exist at all points in time
> between creation and destruction? Subversion maintains a timeline of
> the history of a file. There should not be holes in a timeline.

No, I don't disagree with that. But we apparently have different
views on when an object is created.

I see a copy as creating a new object (as opposed to a move that,
well, moves an already existing object), perhaps that is the wrong
view to have with Subversion. Perhaps someone on the dev team could
shed some insight?

> > Regardless of all that, please see my other post on how to perform the
> > merge. While you may think that it is sub-optimal it does work.
>
> It does work, but it is a manual workaround to a bug and automated tools
> like the merge feature of tortoisesvn either can't automate such a
> workaround or it would be exceedingly difficult. Better to fix the bug.
> Things also get especially complex when you have a branch that is a
> mix of copies from different versions.

Then perhaps the other tools should follow the best practices of
branching to avoid such issues? Perhaps that's why it hasn't really
been discussed before. Anyways until the issues get fixed (and the
other open bugs), I would just avoid it.

:-)
Frodak

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 15 22:20:46 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.