darcs

Issue 81 parallel patches a.k.a. doppleganger patches cannot be merged

Title parallel patches a.k.a. doppleganger patches cannot be merged
Priority bug Status resolved
Milestone Resolved in
Superseder Nosy List darcs-devel, dmitry.kurochkin, kowey, markstos, thorkilnaur, tommy, trentbuck, zooko
Assigned To
Topics Conflicts

Created on 2006-01-04.17:55:52 by zooko, last changed 2009-08-27.14:03:55 by admin.

Messages
msg302 (view) Author: zooko Date: 2006-01-04.17:55:52
For example:

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
msg307 (view) Author: zooko Date: 2006-01-05.14:44:58
See also:

http://www.abridgegame.org/pipermail/darcs-users/2005-April/007231.html
http://www.abridgegame.org/pipermail/darcs-users/2005-May/007600.html
msg325 (view) Author: tommy Date: 2006-01-07.14:51:22
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.
msg2419 (view) Author: markstos Date: 2008-01-11.04:03:32
I believe handling of doppleganger patches is considered "resolved in unstable".
 I'm marking it as such.
msg2425 (view) Author: kowey Date: 2008-01-11.08:00:16
So... doppleganger patches have earned a certain notoriety, partly because of
their name.  Because of that, it may be useful if we specifically had a test for
doppelganger patches, just like we do for conflict fights.  We'd want to be able
to say, "darcs 2.0 fixes the doppleganger patch problem" among other things.
msg2443 (view) Author: zooko Date: 2008-01-11.20:33:13
If you don't have a test for it, then how do you know it's fixed?

Regards,

Zooko
msg2446 (view) Author: droundy Date: 2008-01-11.21:02:13
On Fri, Jan 11, 2008 at 12:29:46PM -0800, zooko wrote:
> If you don't have a test for it, then how do you know it's fixed?

In developing the new patch semantics, I wrote many unit tests, all of
which pass for the new code.  It'd be good to also have a test that runs
darcs as a whole, as Eric suggested.
-- 
David Roundy
Department of Physics
Oregon State University
msg2456 (view) Author: markstos Date: 2008-01-12.23:46:07
I have now 'sent' conflict-doppleganger.pl which tests (successfully) that the
darcs-2 format no longer considers dopplegangers a conflict, while the old
format and the hashed format do (also as expected). 

   Mark
History
Date User Action Args
2006-01-04 17:55:52zookocreate
2006-01-05 14:44:59zookosetstatus: unread -> unknown
nosy: droundy, tommy, zooko
messages: + msg307
2006-01-07 14:51:23tommysetnosy: droundy, tommy, zooko
messages: + msg325
2007-07-16 23:19:01koweysettopic: + Conflicts
nosy: + kowey, beschmi
2007-07-20 14:08:16koweysettopic: - Confirmed
nosy: kowey, zooko, droundy, tommy, beschmi
2007-10-16 04:15:54trentbucksetnosy: + trentbuck
2008-01-11 04:03:33markstossetstatus: unknown -> resolved-in-unstable
nosy: + markstos
messages: + msg2419
2008-01-11 08:00:18koweysetnosy: markstos, droundy, trentbuck, tommy, beschmi, kowey, zooko
messages: + msg2425
2008-01-11 20:33:15zookosetmessages: + msg2443
2008-01-11 21:02:15droundysetmessages: + msg2446
2008-01-12 23:46:09markstossetmessages: + msg2456
2008-09-04 21:27:57adminsetstatus: resolved-in-unstable -> resolved
nosy: + dagit
2009-08-06 17:39:55adminsetnosy: + jast, Serware, dmitry.kurochkin, darcs-devel, mornfall, simon, thorkilnaur, - droundy, trentbuck
2009-08-06 20:36:55adminsetnosy: - beschmi
2009-08-10 22:20:07adminsetnosy: + trentbuck, - darcs-devel, jast, Serware, mornfall
2009-08-11 00:11:40adminsetnosy: - dagit
2009-08-25 17:53:31adminsetnosy: + darcs-devel, - simon
2009-08-27 14:03:55adminsetnosy: tommy, kowey, markstos, darcs-devel, zooko, trentbuck, thorkilnaur, dmitry.kurochkin