Robert Widhopf-Fenk <[EMAIL PROTECTED]> writes: > On Wednesday, March 26, 2008 at 08:36:12, Martin Geisler wrote: > [...] >> 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. > > Yeah, I just downloaded 1.0 and also directory renaming works as > expected, the wiki is just not up to date. > > http://www.selenic.com/mercurial/wiki/index.cgi/RenamePlan
Yeah, that page was last edited in 2006... the page should probably be deleted now. -- 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/
