darcs

Issue 725 obliterate => Error applying hunk to file

Title obliterate => Error applying hunk to file
Priority bug Status resolved
Milestone Resolved in
Superseder Nosy List darcs-devel, dmitry.kurochkin, kowey, thorkilnaur, tommy
Assigned To
Topics Darcs2

Created on 2008-03-03.15:36:35 by kowey, last changed 2009-08-27.13:57:07 by admin.

Files
File name Uploaded Type Edit Remove
bencherror kowey, 2008-03-03.16:40:46 application/octet-stream
Messages
msg3718 (view) Author: kowey Date: 2008-03-03.15:36:33
Note, this output is generated by maybench <http://code.google.com/p/maybench>,
specifically, its darcs-benchmark program.  It works fine with the yi repository.

Running... /usr/local/bin/darcs get --quiet /foo/xmonad main
Running... /usr/local/bin/darcs changes --quiet --repodir main
unrecord last 1
Running... /usr/local/bin/darcs unrecord --quiet --last 1 --all --repodir main
0.10443s
record
Running... /usr/local/bin/darcs record --quiet --all -m "test patch" --repodir main
0.014715s
obliterate last 1
Running... /usr/local/bin/darcs obliterate --quiet --last 1 --all --repodir main
output:
  |
error:
  |
  |darcs failed:  Couldn't undo patch in working dir.
  |user error (Error applying hunk to file ./XMonad/Core.hs)
  |
darcs-benchmark: user error (Error when running command (/usr/local/bin/darcs
obliterate --quiet --last 1 --all --repodir main))
msg3722 (view) Author: droundy Date: 2008-03-03.16:11:12
On Mon, Mar 03, 2008 at 03:36:35PM -0000, Eric Kow wrote:
> Note, this output is generated by maybench <http://code.google.com/p/maybench>,
> specifically, its darcs-benchmark program.  It works fine with the yi repository.

Perhaps you could write a shell script that would reproduce this error?

David
msg3728 (view) Author: kowey Date: 2008-03-03.16:40:46
Seems to also fail on TagSoup.  Attached.
Attachments
msg3736 (view) Author: droundy Date: 2008-03-04.14:31:17
I've reproduced this now.  Thanks!

David
msg3737 (view) Author: droundy Date: 2008-03-04.15:58:27
Okay, I've tracked this down as a time stamp error.  If we add --ignore-times to
record and obliterate, it disappears.  I'm sure we could also achieve the same
with a sleep before the unrecord.  This is old darcs behavior, so I'm not sure
it counts as a bug here.

David
msg3738 (view) Author: droundy Date: 2008-03-04.16:00:34
I should add that it *would* be nice to make darcs more resistant to
accidentally-identical timestamps.  This is worse in darcs2, because we do not
also check file lengths (because it would be more expensive in hashed
repositories, since we don't store them--but we could change that).
msg3739 (view) Author: kowey Date: 2008-03-04.16:07:17
> Okay, I've tracked this down as a time stamp error.  If we add --ignore-times to
> record and obliterate, it disappears.  I'm sure we could also achieve the same
> with a sleep before the unrecord.  This is old darcs behavior, so I'm not sure
> it counts as a bug here.

Is --ignore-times really worth it in practice?
msg3742 (view) Author: kowey Date: 2008-03-04.16:08:00
On Tue, Mar 04, 2008 at 16:02:00 +0000, Eric Y. Kow wrote:
> Is --ignore-times really worth it in practice?

(or rather, the non-ignoring of times)
msg3744 (view) Author: droundy Date: 2008-03-04.16:29:05
On Tue, Mar 04, 2008 at 04:08:01PM -0000, Eric Kow wrote:
> On Tue, Mar 04, 2008 at 16:02:00 +0000, Eric Y. Kow wrote:
> > Is --ignore-times really worth it in practice?
> 
> (or rather, the non-ignoring of times)

Yeah, I had it disabled for darcs-2 and Simon M. complained about darcs
whatsnew taking a minute or more.  That's not really acceptable.
-- 
David Roundy
Department of Physics
Oregon State University
msg4066 (view) Author: droundy Date: 2008-03-28.15:04:29
I believe this is fixed by the change I recently made which only allows
timestamp comparisons when we've also got file lengths to go on.  This makes
timestamps much safer to use.  And with the sha2 hashes we also are now storing
file lengths.

David
History
Date User Action Args
2008-03-03 15:36:35koweycreate
2008-03-03 16:11:13droundysetstatus: unread -> unknown
nosy: droundy, tommy, beschmi, kowey
messages: + msg3722
2008-03-03 16:40:47koweysetfiles: + bencherror
nosy: droundy, tommy, beschmi, kowey
messages: + msg3728
2008-03-04 00:09:40markstossetstatus: unknown -> waiting-for
topic: + Darcs2
nosy: droundy, tommy, beschmi, kowey
2008-03-04 14:31:19droundysetstatus: waiting-for -> unknown
nosy: droundy, tommy, beschmi, kowey
messages: + msg3736
2008-03-04 15:58:29droundysetnosy: droundy, tommy, beschmi, kowey
messages: + msg3737
2008-03-04 16:00:35droundysetnosy: droundy, tommy, beschmi, kowey
messages: + msg3738
2008-03-04 16:07:18koweysetnosy: droundy, tommy, beschmi, kowey
messages: + msg3739
2008-03-04 16:08:01koweysetnosy: droundy, tommy, beschmi, kowey
messages: + msg3742
2008-03-04 16:29:06droundysetnosy: droundy, tommy, beschmi, kowey
messages: + msg3744
2008-03-28 15:04:30droundysetstatus: unknown -> resolved
nosy: droundy, tommy, beschmi, kowey
messages: + msg4066
2009-08-06 17:55:33adminsetnosy: + markstos, jast, Serware, dmitry.kurochkin, darcs-devel, zooko, dagit, mornfall, simon, thorkilnaur, - droundy
2009-08-06 20:59:36adminsetnosy: - beschmi
2009-08-10 22:16:57adminsetnosy: - markstos, darcs-devel, zooko, jast, dagit, Serware, mornfall
2009-08-25 18:06:59adminsetnosy: + darcs-devel, - simon
2009-08-27 13:57:07adminsetnosy: tommy, kowey, darcs-devel, thorkilnaur, dmitry.kurochkin