Robert Widhopf-Fenk <[EMAIL PROTECTED]> writes: > On Wednesday, March 19, 2008 at 08:53:30, Martin Geisler wrote: > >> If you mean the ability to rename files and have hg know about it, >> then you: 'hg rename' does what you expect. >> >> If you refer to the issue about renamed files taking up twice the >> space you would expect, then that is not yet fixed. There is a >> Google Summer of Code project on it, though: > > Neither these two, I mean the proper support for merging changes if > renames occurred. > > I had this horrible experience at work with SVN where I branched a > new development line and did a lot of refactoring including renaming > of files. > > Finally the day came when I had to merge bugfixes from the original > branch into the development branch. It just did not work. I have > created a patch where I manually changed the filenames to be the new > ones and then applied that patch. Also I ended up to do the same > file renaming on the original branch to allow easier merging for the > future.
Ah, okay. I have just made a small test there I renamed and edited a file in one clone and made another edit to the file in another clone. I could merge the changes just fine: I ended up with a renamed file containing both changes, as one would hope. So I think the issue you ran into with SVN does not apply to Mercurial. -- Martin Geisler VIFF (Virtual Ideal Functionality Framework) brings easy and efficient SMPC (Secure Multi-Party Computation) to Python. See: http://viff.dk/. ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace _______________________________________________ bbdb-info@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bbdb-info BBDB Home Page: http://bbdb.sourceforge.net/
