Hi, Miklos Vajna <[EMAIL PROTECTED]> writes: > - conflicts are dropped, just like during the darcs1 -> darcs2 > conversion (but of course result is the same) could you please elaborate this point? The darcs1 -> darcs2 conversion, to my knowledge, only simplifies nested mergers into conflictors, but does not lose the record of the (resolved) conflict. But yes, there are some cases where lossy conversion is done (and that's possibly the reason it's hard to make convert work on multiple branches of same repository)...
Yours, Petr. -- Peter Rockai | me()mornfall!net | prockai()redhat!com http://blog.mornfall.net | http://web.mornfall.net "In My Egotistical Opinion, most people's C programs should be indented six feet downward and covered with dirt." -- Blair P. Houghton on the subject of C program indentation _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
