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

RE: Code Loss!?

From: Irvine, Chuck R [EQ] <Chuck.R.Irvine_at_Embarq.com>
Date: 2007-04-10 21:35:29 CEST

> -----Original Message-----
> From: Les Mikesell [mailto:lesmikesell@gmail.com]
> Sent: Tuesday, April 10, 2007 2:27 PM
> To: Irvine, Chuck R [EQ]
> Cc: users@subversion.tigris.org
> Subject: Re: Code Loss!?
> Irvine, Chuck R [EQ] wrote:
> > I just read this in the SVN Book:
> >
> > "...suppose that while working on your private branch, you rename
> > integer.c to whole.c. Effectively you've created a new
> file in your
> > branch that is a copy of the original file, and deleted the
> original
> > file. Meanwhile, back on trunk, Sally has committed some
> improvements
> > to integer.c. Now you decide to merge your branch to the
> trunk. ...The
> > merge operation has deleted the latest version of integer.c
> file (the
> > one containing Sally's latest changes), and blindly added your new
> > whole.c file - which is a duplicate of the older version of
> integer.c.
> > The net effect is that merging your "rename" to the branch
> has removed
> > Sally's recent changes from the latest revision!"
> >
> > Coming from CVS, I was happy to have rename and move functionality,
> > but now I'm not so sure.
> >
> > I consider pretty serious: there is a known, predictable situation
> > that will result in code loss. I'd have to consider this a "defect"
> > and not a "feature". Does anyone know if this is being worked on?
> > Thanks
> The code is only "lost" as in "you have to work to find it",
> not lost as
> in gone. If you want the stuff that was on the trunk before
> your merge
> back, check that revision back out - or diff against it to see what
> happened.

Well, you're right, it is retrievable, but the problem is you might
never know that the code got dropped until the problems surfaces,
perhaps as a defect in production. Then, after much pain, you isolate
the problem and resurrect the code.

It would be much better to get a conflict notification of some sort,
something like "rename of foo conflicts with change or foo".

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 10 21:37:13 2007

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