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

Re: Understanding move merge

From: <kfogel_at_newton.ch.collab.net>
Date: 2003-01-20 21:27:40 CET

Greg Ward gward@mems-exchange.org writes:
   * I can view the log of old.c up to the point of the rename with cvs
     log old.c, at any point in the future. The name old.c lives on
     forever to CVS, but the file no longer exists. Apparently
     Subversion will never be able to do this, because it requires
     guessing the URL for old.c.

Well, you have to know its name in CVS too, as your example states
above :-). But Subversion can trace from the new file through to the
old one, too (modulo bugs in the current code)

   * I can use cvs diff to get diffs from before the rename, or even
     across the rename. Subversion cannot do this, but I gather this
     is a bug that will be fixed.

Check.

   * Since I can diff before/across/after the rename, I *assume*
     merging (cvs up -j) works, but I haven't tried it and I very
     rarely merge with CVS. But I know it doesn't work with Subversion.

See Kevin's earlier mail. This is sometimes a bug, and sometimes a
more fundamental problem, in Subversion.

   * If I check out my project using a pre-rename tag, I will get
     old.c and not new.c. If I check out my project using a post-rename
     tag, I will get new.c and not old.c. (Of course, this only holds
     if I remember to remove tags from new.c, which is why that's an
     important step.)

Yes. That's true in Subversion too; except that you don't have to
remember to remove tags.

 When I say file rename currently works better with CVS than it does with
 Subversion, I'm really talking about how things look after the rename
 has been done. Once the complicated, error-prone, non-atomic, direct
 repository fiddling is done, file renames Just Work with CVS. That's
 not currently the case with Subversion.

Granted.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 14 02:03:08 2006

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