[darcs-devel] [issue1669] pull => error applying hunk to file (2.3.1)

Zooko bugs at darcs.net
Mon Jan 11 04:41:47 UTC 2010


Zooko <zooko at zooko.com> added the comment:

kowey wrote: "I'm confused by this: why does Zooko have different patches under
the same patch info?  Wouldn't amending change the date?  Doesn't the patch salt
mechanism from issue27 prevent this?"

I don't have multiple patches under the same patch info -- all three versions of
the patch have different timestamps and Ignore-This salts:

HACK yukyuk:~/playground/pycryptopp/X/pycryptopp/_darcs$ time zgrep -A2 "fix a
bug in the one of the unit tests which"  *
hashed_inventory:[ecdsa: fix a bug in the one of the unit tests which caused it
to not-test what it was supposed to
hashed_inventory:zooko at zooko.com**20091031042939
hashed_inventory: Ignore-this: eef97738c0669fd44313be6c02dc5e74

real    0m0.302s
user    0m0.048s
sys     0m0.186s
HACK yukyuk:~/playground/pycryptopp/X/pycryptopp/_darcs$ cd patches/
HACK yukyuk:~/playground/pycryptopp/X/pycryptopp/_darcs/patches$ time zgrep -A2
"fix a bug in the one of the unit tests which"  *
0000000291-e1cdda90fe564a338d1a918150cf2a805d7cd365406e221f14257e701f507d50:[ecdsa:
fix a bug in the one of the unit tests which caused it to not-test what it was
supposed to
0000000291-e1cdda90fe564a338d1a918150cf2a805d7cd365406e221f14257e701f507d50:zooko at zooko.com**20091031042649
0000000291-e1cdda90fe564a338d1a918150cf2a805d7cd365406e221f14257e701f507d50:
Ignore-this: 2d5f069034c569e457063e0a3170b67a
0000000451-d79652e268e995b51de296784e082e4eebc7b19fc9cec444823670a503470d95:[ecdsa:
fix a bug in the one of the unit tests which caused it to not-test what it was
supposed to
0000000451-d79652e268e995b51de296784e082e4eebc7b19fc9cec444823670a503470d95:zooko at zooko.com**20091031042830
0000000451-d79652e268e995b51de296784e082e4eebc7b19fc9cec444823670a503470d95:
Ignore-this: 14b3277639ae5e4dafe719dd9f91c65b
0000000470-381ace4f21b0f4ddb3df7f1e8378aad572f2867656853897b1fdb84b7d290867:[ecdsa:
fix a bug in the one of the unit tests which caused it to not-test what it was
supposed to
0000000470-381ace4f21b0f4ddb3df7f1e8378aad572f2867656853897b1fdb84b7d290867:zooko at zooko.com**20091031042939
0000000470-381ace4f21b0f4ddb3df7f1e8378aad572f2867656853897b1fdb84b7d290867:
Ignore-this: eef97738c0669fd44313be6c02dc5e74
unrevert:[ecdsa: fix a bug in the one of the unit tests which caused it to
not-test what it was supposed to
unrevert:zooko at zooko.com**20091031042939
unrevert: Ignore-this: eef97738c0669fd44313be6c02dc5e74

real    0m28.856s
user    0m8.705s
sys     0m17.609s

You can verify by inspecting the pycryptopp.7z file that I uploaded
2009-10-31.04:37:32.

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue1669>
__________________________________


More information about the darcs-devel mailing list