Created on 2006-02-18.20:17:34 by clive, last changed 2009-08-27.14:04:12 by admin.
msg496 (view) |
Author: clive |
Date: 2006-02-18.20:17:32 |
|
I have one project which is a branch of another. I created a patch in the first
which removed a directory tree which both of them contain individually in
slightly modified states, this is what happened when I tried to pull the patch
from the 'root' repo downstream into the branch:
--
clive% darcs pull
Pulling from "../newt"...
Fri Feb 17 19:39:58 SAST 2006 Clive Crous <clive@darkarts.co.za>
* remove artifacts
Shall I pull this patch? (1/1) [ynWvpxqadjk], or ? for help: y
darcs: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
hunk
./_artifacts/active/00000013|bug|clive@darkarts.co.za|colouring\32\for\32\tty\32\now\32\incorrect\32\(los\32\related)
1
-2005-05-12 19:19:30 UCT clive@darkarts.co.za created
-2005-05-12 19:19:30 UCT clive@darkarts.co.za category bug
-2005-05-12 19:19:30 UCT clive@darkarts.co.za summary colouring for tty now
incorrect (los related)
-2005-05-12 19:19:30 UCT clive@darkarts.co.za assign clive@darkarts.co.za
-2005-05-12 19:19:39 UCT clive@darkarts.co.za activated 13
-2005-06-19 12:15:42 UCT clive@darkarts.co.za note this is a lizard bug, it does
not affect newt and shouldn't be here
-2005-06-19 12:15:42 UCT clive@darkarts.co.za closed
merger 0.0 (
hunk
./_artifacts/active/00000013|bug|clive@darkarts.co.za|colouring\32\for\32\tty\32\now\32\incorrect\32\(los\32\related)
6
+2005-06-19 12:15:42 UCT clive@darkarts.co.za note this is a lizard bug, it does
not affect newt and shouldn't be here
+2005-06-19 12:15:42 UCT clive@darkarts.co.za closed
hunk
./_artifacts/active/00000013|bug|clive@darkarts.co.za|colouring\32\for\32\tty\32\now\32\incorrect\32\(los\32\related)
6
+2005-06-19 12:09:42 UCT clive@darkarts.co.za note fixed
+2005-06-19 12:09:42 UCT clive@darkarts.co.za closed
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
move
./_artifacts/pending/pending.fMz6li!clive@darkarts.co.za|feature|clive@darkarts.co.za|on\32\screen\32\indicator\32\for\32\when\32\monster\32\moves\32\are\32\busy,\32\hourglass\32\or\32\equivalent
./_artifacts/active/00000015|feature|clive@darkarts.co.za|on\32\screen\32\indicator\32\for\32\when\32\monster\32\moves\32\are\32\busy,\32\hourglass\32\or\32\equivalent
rmdir ./_artifacts/active
)
merger 0.0 (
move
./_artifacts/active/00000013|bug|clive@darkarts.co.za|colouring\32\for\32\tty\32\now\32\incorrect\32\(los\32\related)
./_artifacts/closed/00000013|bug|clive@darkarts.co.za|colouring\32\for\32\tty\32\now\32\incorrect\32\(los\32\related)
move
./_artifacts/active/00000013|bug|clive@darkarts.co.za|colouring\32\for\32\tty\32\now\32\incorrect\32\(los\32\related)
./_artifacts/closed/00000013|bug|clive@darkarts.co.za|colouring\32\for\32\tty\32\now\32\incorrect\32\(los\32\related)
)
)
rmfile
./_artifacts/closed/00000013|bug|clive@darkarts.co.za|colouring\32\for\32\tty\32\now\32\incorrect\32\(los\32\related)
)
)
Please report this to bugs@darcs.net
If possible include the output of 'darcs --exact-version'.
--
clive% darcs --exact-version
darcs compiled on Dec 24 2005, at 18:11:11
unknown
--
In my mind the above is completely useless as well. So:
clive% darcs --version
1.0.5 (release)
|
msg497 (view) |
Author: droundy |
Date: 2006-02-20.13:35:05 |
|
...
> darcs: bug in darcs!
> in function reconcile_unwindings
I'm afraid this is a known issue, but not one that we know how to fix,
although we're working on it. The trouble is in the old-style conflict
handling, which has a few fundamental flaws. :(
The workaround is to unrecord some patches on one branch or the other so
that darcs doesn't have to do this conflicting merge. One possibility
might be to unrecord the directory removal and synchronize the two branches
before removing the directory--which also might be incompatible with the
reason you have two branches in the first place. :(
--
David Roundy
|
msg2389 (view) |
Author: markstos |
Date: 2008-01-09.04:22:04 |
|
This bug is a duplicate one that is resolved-in-unstable.
|
|
Date |
User |
Action |
Args |
2006-02-18 20:17:34 | clive | create | |
2006-02-20 13:35:07 | droundy | set | status: unread -> unknown nosy:
droundy, tommy, clive messages:
+ msg497 |
2006-03-03 15:58:40 | jch | set | priority: urgent -> bug nosy:
droundy, tommy, clive title: darcs crash on pull -> bug in reconcile_unwindings again |
2006-07-04 12:01:59 | droundy | set | nosy:
droundy, tommy, clive superseder:
+ pull => bug in function reconcile_unwindings (** minimal test case **) |
2007-07-18 09:58:48 | kowey | set | status: unknown -> deferred nosy:
+ kowey, beschmi title: bug in reconcile_unwindings again -> pull => bug in reconcile_unwindings (1.0.5) |
2007-07-18 10:01:08 | kowey | set | topic:
+ Conflicts |
2007-07-23 14:05:22 | kowey | set | title: pull => bug in reconcile_unwindings (1.0.5) -> pull => bug in function reconcile_unwindings (1.0.5) |
2007-08-03 17:23:48 | droundy | set | status: deferred -> duplicate |
2008-01-09 04:22:05 | markstos | set | status: duplicate -> resolved-in-unstable nosy:
+ markstos messages:
+ msg2389 |
2008-09-04 21:28:11 | admin | set | status: resolved-in-unstable -> resolved nosy:
+ dagit |
2009-08-06 17:33:29 | admin | set | nosy:
+ jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy, clive |
2009-08-06 20:30:58 | admin | set | nosy:
- beschmi |
2009-08-10 21:44:07 | admin | set | nosy:
+ clive, - darcs-devel, zooko, jast, Serware, mornfall |
2009-08-10 23:53:23 | admin | set | nosy:
- dagit |
2009-08-25 17:48:14 | admin | set | nosy:
+ darcs-devel, - simon |
2009-08-27 14:04:12 | admin | set | nosy:
tommy, kowey, markstos, darcs-devel, clive, thorkilnaur, dmitry.kurochkin |
|