darcs

Issue 663 bug when pulling with conflicts (1.0.9)

Title bug when pulling with conflicts (1.0.9)
Priority bug Status resolved
Milestone Resolved in
Superseder Nosy List darcs-devel, dmitry.kurochkin, kowey, markstos, olivier.schwander, olivier.schwander, thorkilnaur, tommy
Assigned To
Topics

Created on 2008-02-08.17:48:58 by olivier.schwander, last changed 2009-10-24.09:10:19 by admin.

Files
File name Uploaded Type Edit Remove
log.darcs oschwand, 2008-02-18.11:10:59 application/octet-stream
Messages
msg3239 (view) Author: olivier.schwander Date: 2008-02-08.17:48:56
Hello,

Here is a trace of a darcs pull. Darcs failed to pull pathed leading to
conflicts and said me to email to this list.

The version used is "1.0.9 (release)" (from Debian Sid).

The repository contains some file that were sharply deleted and
recreated because I have forgotten there was a darcs repository in my
/home. I have no idea if it is a real bug or only a bad use from me,
sorry if it is the case.

Don't hesitate to ask more precisions.

Thanks,

Olivier
msg3243 (view) Author: markstos Date: 2008-02-08.18:51:27
Olivier,

Could you test again with the pre-release binaries available from here? 

http://wiki.darcs.net/DarcsWiki/DarcsTwo

I suspect you'll find the bug is fixed. You may need to first run "darcs
convert" on the upstream repo before trying the pull again. 

You can also search this bug tracker for similar reports and results:

http://bugs.darcs.net/

  Mark
msg3522 (view) Author: markstos Date: 2008-02-17.01:41:49
This issue is "presumed-dead" in the unstable branch, but can't be confirmed
without further testing from the reporter, who hasn't responded in the last week. 

Olivier: please re-open this issue if you find the problem persists with a darcs
2 binary.
msg3529 (view) Author: olivier.schwander Date: 2008-02-18.11:10:59
Sorry for the long delay, I didn't have time to answer.

I didn't anymore have the original buggy repository, but only a fresh copy made
with 'darcs get'.

With darcs 1.0.9-1 from debian, I have a new error:
"bug in darcs! in function reconcile_unwindings"
followed by a sequence of hunks (I join a copy of the trace).

After converting the source and target repositories, I have the error:
"darcs: bug in get_extra commuting patch:"
followed by the name of the patch.

Olivier
Attachments
msg3889 (view) Author: markstos Date: 2008-03-17.01:38:14
oschwand, 

Thanks for your help with this. The "reconcile_unwindings"  issue is fixed in
the unstable branch. (You can search for reconcile_unwindings in the bug tracker
to confirm this). 

Regarding the error you got with Darcs 2, "convert" is not meant to be run on
more than repository in a group of related repositories. It appears you did
that, and errors are expected in that case. If there's a way to make the docs
for "convert" more clear about this, please let us know. 

   Mark
History
Date User Action Args
2008-02-08 17:48:58olivier.schwandercreate
2008-02-08 18:51:28markstossetpriority: bug
status: unread -> waiting-for
messages: + msg3243
nosy: + markstos
2008-02-09 05:22:28markstoslinkissue664 superseder
2008-02-17 01:41:50markstossetstatus: waiting-for -> wont-fix
nosy: droundy, tommy, beschmi, kowey, markstos, olivier.schwander
messages: + msg3522
title: bu when pulling with conflicts -> bug when pulling with conflicts (1.0.9)
2008-02-18 11:11:01oschwandsetfiles: + log.darcs
nosy: + oschwand
messages: + msg3529
2008-02-18 15:42:33markstossetstatus: wont-fix -> unknown
nosy: droundy, tommy, beschmi, kowey, markstos, olivier.schwander, oschwand
2008-03-17 01:38:16markstossetstatus: unknown -> resolved-in-unstable
nosy: droundy, tommy, beschmi, kowey, markstos, olivier.schwander, oschwand
messages: + msg3889
2008-09-04 21:32:26adminsetstatus: resolved-in-unstable -> resolved
nosy: + dagit
2009-08-06 17:53:50adminsetnosy: + jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy, olivier.schwander, oschwand
2009-08-06 20:57:14adminsetnosy: - beschmi
2009-08-10 22:14:11adminsetnosy: + olivier.schwander, oschwand, - darcs-devel, zooko, jast, Serware, mornfall
2009-08-11 00:06:32adminsetnosy: - dagit
2009-08-25 18:05:11adminsetnosy: + darcs-devel, - simon
2009-08-27 14:08:49adminsetnosy: tommy, kowey, markstos, darcs-devel, thorkilnaur, olivier.schwander, oschwand, dmitry.kurochkin
2009-10-24 09:10:19adminsetnosy: + olivier.schwander, - oschwand