darcs

Issue 335 pull => bug in function reconcile_unwindings (1.0.9rc2)

Title pull => bug in function reconcile_unwindings (1.0.9rc2)
Priority bug Status duplicate
Milestone Resolved in
Superseder pull => bug in function reconcile_unwindings (** minimal test case **)
View: 194
Nosy List Korusef, darcs-devel, dmitry.kurochkin, kowey, thorkilnaur, tommy
Assigned To
Topics Conflicts

Created on 2006-11-08.13:32:32 by Korusef, last changed 2009-08-27.13:50:44 by admin.

Files
File name Uploaded Type Edit Remove
log.log Korusef, 2006-11-08.13:32:23 text/x-log
Messages
msg1183 (view) Author: Korusef Date: 2006-11-08.13:32:23
In the attached log is the error when I was trying to repair commited
patches by splitting them.

The commands were:
darcs get A B
cd B;
darcs obliterate --patch='....';
darcs pull <one patch>
darcs unrecord <the pulled patch>
#some changes to the file and then saved as few separate patches
darcs pull <again the same patch>
darcs revert #to get rid of the conflicts
darcs rollback
#several edit + darcs revert + darcs record to make the final version

#now I can't pull or push from the repo
Attachments
History
Date User Action Args
2006-11-08 13:32:32Korusefcreate
2007-03-09 08:46:25koweysetnosy: + beschmi
title: pulling to rollbacked branch -> scrad: bug in darcs! in function reconcile_unwindings (1.0.9rc2)
2007-07-18 08:13:39koweysetstatus: unread -> deferred
topic: + Conflicts
title: scrad: bug in darcs! in function reconcile_unwindings (1.0.9rc2) -> pull => bug in function reconcile_unwindings (1.0.9rc2)
superseder: + pull => bug in function reconcile_unwindings (** minimal test case **)
nosy: droundy, tommy, beschmi, kowey, Korusef
2007-08-03 17:26:24droundysetstatus: deferred -> duplicate
2009-08-06 17:41:22adminsetnosy: + markstos, jast, Serware, dmitry.kurochkin, darcs-devel, zooko, dagit, mornfall, simon, thorkilnaur, - droundy, Korusef
2009-08-06 20:38:31adminsetnosy: - beschmi
2009-08-10 21:58:23adminsetnosy: + Korusef, - markstos, darcs-devel, zooko, jast, dagit, Serware, mornfall
2009-08-25 17:54:57adminsetnosy: + darcs-devel, - simon
2009-08-27 13:50:44adminsetnosy: tommy, kowey, darcs-devel, Korusef, thorkilnaur, dmitry.kurochkin