On Wed, Jan 04, 2006 at 05:55:53PM +0000, Zooko wrote: > http://thread.gmane.org/gmane.comp.version-control.darcs.user/9129 > or another archive of same discussion: > http://www.abridgegame.org/pipermail/darcs-users/2005-December/009222.html > or another archive of same discussion: > http://marc.theaimsgroup.com/?l=darcs-users&m=113600774107991&w=2
We might have a confusion of terminology here. I didn't consider the possibility of Mark Lentczner facing a doppleganger. I was only thinking of parallel patches in general. But since the "hang" happened after only two mergers, a doppleganger might be the cause of the problem. Mark, When you described how you were using the base repo, I assumed you did this knowingly to avoid dopplegangers. The key point is to have a single path for syncing changes between a darcs branch and the CVS repo. If, for example, another developer working on the darcs branch does a CVS commit of one of the changes in the darcs branch, these changes can loop back to base on the next CVS update, where they will be recorded a second time (as a doppleganger) in the update patch. When the update patch is then pulled to working, it will conflict in the worst possible way with the original patch. -- Tommy Pettersson <[EMAIL PROTECTED]> _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
