Concerning Re: Lost updates due to file moves
Ryan Schmidt wrote on 2 Feb 2009, 14:24, at least in part:
> On Feb 2, 2009, at 07:33, Christoph Bartoschek wrote:
>
> > My question is whether the following still can happen with the
> > current implementation of merge tracking in subversion 1.5?
> >
> > 1. In the trunk a file is moved to another directory:
> >
> > svn mv base/timer.C timing/timer.C
> >
> > 2. In a development branch the file is changed:
> >
> > svn ci -m "..." base/timer.C
> >
> > 3. The changes to the trunk are merged into the branch.
> >
> > svnmerge -b merge
> >
> >
> > Now the changes in step 2. are lost.
>
> Unfortunately that sounds plausible to me. Renames are a bit
> problematic if you're working in a team.
>
> > I am not sure that this three steps are
> > enough to reproduce the problem but it is not the first time that
> > this happened to us.
> >
> > Is the new merge tracking system able to track file movements in a
> > sane way compared to the older version we use?
>
> You could install Subversion 1.5 on a test system and test to see if
> it works better for you in this regard.
>
> But I think this is probably more a true-renames issue than a merging
> issue.
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=898
To me it looks more like the original use case of what was dubbed
"tree conflict". I came across it recently another way, not by
branch/trunk merges, but merging history in the same branch (aka
undoing stuff) and was told that 1.6 will add handling for this sort of
conflicts.
(See "Limitation of Undoing: Dataloss" in the user list archive
[late December]).
Jan hendrik
---------------------------------------
Freedom quote:
Caesar had his Brutus; Charles the First his Cromwell;
and George the Third - George the Third may profit by their example.
If this be treason, make the most of it.
-- Patrick Henry, 1765
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1092245
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-02 21:44:39 CET