On Wed, Apr 14, 2010 at 09:43:37AM +0000, Eric Kow wrote: > On Wed, Apr 14, 2010 at 09:24:17 +0000, Vincent Zweije wrote: > > There must be something in the history of the repository > > causing the crash. > > > > Actually, looks like there are two problems: > > > > 1. The pull produces a patch that does not apply to the > > pull destination, and > > > > 2. The non-applying patch causes a darcs crash. > > > > Would you agree that the first is the more interesting? > > This depends... where there any conflictors involved in the > edit-the-line number stage? Editing conflictors is rather tricky > business so there may be a risk of accidentally introducing a red > herring for #1.
They were all plain hunk patches, some deleting lines, some inserting lines, and some replacing lines. The history contains several conflicts, though. > If no herrings are involved then it might make > sense to open a new bug for #1. Otherwise, the best is to ensure > that your edits manage to preserve the 'Irrefutable pattern' > message. I've gone back to a non-coalesced history. Most hunks can be made to apply by fixing their line numbers. If the line numbers are wrong, darcs produces a normal error: cannot apply patch, instead of a crash. It turns out two hunks cannot be got to apply by modifying their line numbers. Somewhere in the region where the line numbers presumably should be (a region of 4 line numbers), the darcs error turns into the dreaded darcs crash. By the way, to speed up this line number editing, what precisely is the line number of a hunk supposed to mean? -- WCC - Smart Search & Match NL +31 30 7503222 vzwe...@wcc-group.com www.wcc-group.com
signature.asc
Description: Digital signature
