[darcs-devel] [issue1669] apply => error applying hunk to file (2.3.1)
Zooko
bugs at darcs.net
Wed Jan 13 06:34:07 UTC 2010
Zooko <zooko at zooko.com> added the comment:
Oh, and look the hashed_inventory says that one of these patches is something
else -- a tag that was recorded four days later:
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
grep -A2 "disable ECDSA so" *
0000003679-92bb97d3bcba9b53a2bdfa5e6ffd1e9550c2d8a08c0ec891deb6fa6cf5b68bf5:
works, but isn't ready for long-term support)
0000003679-92bb97d3bcba9b53a2bdfa5e6ffd1e9550c2d8a08c0ec891deb6fa6cf5b68bf5-
0000003679-92bb97d3bcba9b53a2bdfa5e6ffd1e9550c2d8a08c0ec891deb6fa6cf5b68bf5-
Ignore-this: be45aafeded8e5ecaa8b61457f012741
--
0000004212-4a261603078f9642da899751ce6da13fc457e215838778d533c3a5f9d7bdbee9:
works, but isn't ready for long-term support)
0000004212-4a261603078f9642da899751ce6da13fc457e215838778d533c3a5f9d7bdbee9-
0000004212-4a261603078f9642da899751ce6da13fc457e215838778d533c3a5f9d7bdbee9-
Ignore-this: be45aafeded8e5ecaa8b61457f012741
--
unrevert:[ecdsa: disable ECDSA so that nobody starts to rely on it (the current
version works, but isn't ready for long-term support)
unrevert-zooko at zooko.com**20090617211044
unrevert- Ignore-this: be45aafeded8e5ecaa8b61457f012741
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
grep -B3 -Ee"92bb97d3bcba9b53a2bdfa5e6ffd1e9550c2d8a08c0ec891deb6fa6cf5b68bf5|
../hashed_inventory-zooko at zooko.com**20090617211044
../hashed_inventory- Ignore-this: be45aafeded8e5ecaa8b61457f012741
../hashed_inventory-]
../hashed_inventory:hash:
0000003679-92bb97d3bcba9b53a2bdfa5e6ffd1e9550c2d8a08c0ec891deb6fa6cf5b68bf5
--
../hashed_inventory-zooko at zooko.com**20090621213654
../hashed_inventory- Ignore-this: 9e3be63ac03e1c2b9b9ae8fba4d49686
../hashed_inventory-]
../hashed_inventory:hash:
0000004212-4a261603078f9642da899751ce6da13fc457e215838778d533c3a5f9d7bdbee9
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
grep -B4 -Ee"92bb97d3bcba9b53a2bdfa5e6ffd1e9550c2d8a08c0ec891deb6fa6cf5b68bf5|
../hashed_inventory-[ecdsa: disable ECDSA so that nobody starts to rely on it
(the current version works, but isn't ready for long-term support)
../hashed_inventory-zooko at zooko.com**20090617211044
../hashed_inventory- Ignore-this: be45aafeded8e5ecaa8b61457f012741
../hashed_inventory-]
../hashed_inventory:hash:
0000003679-92bb97d3bcba9b53a2bdfa5e6ffd1e9550c2d8a08c0ec891deb6fa6cf5b68bf5
--
../hashed_inventory-[TAG pycryptopp-0.5.14
../hashed_inventory-zooko at zooko.com**20090621213654
../hashed_inventory- Ignore-this: 9e3be63ac03e1c2b9b9ae8fba4d49686
../hashed_inventory-]
../hashed_inventory:hash:
0000004212-4a261603078f9642da899751ce6da13fc457e215838778d533c3a5f9d7bdbee9
Oh, and look, there are also two different patches for that tag with the same
Ignore-This and patch-id:
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
grep -A2 "pycryptopp-0.5.14" *
0000000812-3ebd0107cf4074b0c6d5a4270c5ee857e95a5071a5a89c1790fde2a8424257c0:
0000000812-3ebd0107cf4074b0c6d5a4270c5ee857e95a5071a5a89c1790fde2a8424257c0-
0000000812-3ebd0107cf4074b0c6d5a4270c5ee857e95a5071a5a89c1790fde2a8424257c0-
Ignore-this: 9e3be63ac03e1c2b9b9ae8fba4d49686
--
0000004212-4a261603078f9642da899751ce6da13fc457e215838778d533c3a5f9d7bdbee9:
0000004212-4a261603078f9642da899751ce6da13fc457e215838778d533c3a5f9d7bdbee9-
0000004212-4a261603078f9642da899751ce6da13fc457e215838778d533c3a5f9d7bdbee9-
Ignore-this: 9e3be63ac03e1c2b9b9ae8fba4d49686
--
unrevert:[TAG pycryptopp-0.5.14
unrevert-zooko at zooko.com**20090621213654
unrevert- Ignore-this: 9e3be63ac03e1c2b9b9ae8fba4d49686
I don't remember for sure, but I think I might have used
unrecord/obliterate/amend-record on that tag.
Oh and look, hashed_inventory thinks that one of those two tags is something
else: a different tag that was made a couple of weeks later:
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
grep -B4 -Ee"3ebd0107cf4074b0c6d5a4270c5ee857e95a5071a5a89c1790fde2a8424257c0|
../hashed_inventory-[TAG pycryptopp-0.5.14
../hashed_inventory-zooko at zooko.com**20090621213654
../hashed_inventory- Ignore-this: 9e3be63ac03e1c2b9b9ae8fba4d49686
../hashed_inventory-]
../hashed_inventory:hash:
0000004212-4a261603078f9642da899751ce6da13fc457e215838778d533c3a5f9d7bdbee9
--
../hashed_inventory-[TAG pycryptopp-0.5.15
../hashed_inventory-zooko at zooko.com**20090705194216
../hashed_inventory- Ignore-this: 363bb3b96b701befb5a8ebb47c5949ad
../hashed_inventory-]
../hashed_inventory:hash:
0000000812-3ebd0107cf4074b0c6d5a4270c5ee857e95a5071a5a89c1790fde2a8424257c0
Oh and I see that there are again patches with the same timestamp+IgnoreThis
but different patchids which think they are that tag:
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
grep -A2 "pycryptopp-0.5.15" *
0000000812-3ebd0107cf4074b0c6d5a4270c5ee857e95a5071a5a89c1790fde2a8424257c0:
0000000812-3ebd0107cf4074b0c6d5a4270c5ee857e95a5071a5a89c1790fde2a8424257c0-
0000000812-3ebd0107cf4074b0c6d5a4270c5ee857e95a5071a5a89c1790fde2a8424257c0-
Ignore-this: 363bb3b96b701befb5a8ebb47c5949ad
--
0000001125-0b8d2729da1dc3f12ce537cf551ec4d7cb7896c825731e7683f5c64dcf8f52fd:
0000001125-0b8d2729da1dc3f12ce537cf551ec4d7cb7896c825731e7683f5c64dcf8f52fd-
0000001125-0b8d2729da1dc3f12ce537cf551ec4d7cb7896c825731e7683f5c64dcf8f52fd-
Ignore-this: 363bb3b96b701befb5a8ebb47c5949ad
--
unrevert:[TAG pycryptopp-0.5.15
unrevert-zooko at zooko.com**20090705194216
unrevert- Ignore-this: 363bb3b96b701befb5a8ebb47c5949ad
Oh, and hashed inventory thinks that one of *those* is the next tag that I made
a while later:
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
grep -B4 -Ee"3ebd0107cf4074b0c6d5a4270c5ee857e95a5071a5a89c1790fde2a8424257c0|
../hashed_inventory-[TAG pycryptopp-0.5.15
../hashed_inventory-zooko at zooko.com**20090705194216
../hashed_inventory- Ignore-this: 363bb3b96b701befb5a8ebb47c5949ad
../hashed_inventory-]
../hashed_inventory:hash:
0000000812-3ebd0107cf4074b0c6d5a4270c5ee857e95a5071a5a89c1790fde2a8424257c0
../hashed_inventory-[TAG pycryptopp-0.5.16
../hashed_inventory-zooko at zooko.com**20090727125049
../hashed_inventory- Ignore-this: be0408712088064c264fe4c8324e8809
../hashed_inventory-]
../hashed_inventory:hash:
0000001125-0b8d2729da1dc3f12ce537cf551ec4d7cb7896c825731e7683f5c64dcf8f52fd
Yep, same thing goes the tags named "pycryptopp-0.5.16":
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
grep -A2 "pycryptopp-0.5.16" *
0000000388-c3095c23ddc3a799f9ee929149190b57b130414a43d534f3e1b820cef45b5f46:+
* release pycryptopp-0.5.16
0000000388-c3095c23ddc3a799f9ee929149190b57b130414a43d534f3e1b820cef45b5f46-+
0000000388-c3095c23ddc3a799f9ee929149190b57b130414a43d534f3e1b820cef45b5f46-+
* setup.py, misc/: a few improvements to the build/packaging
--
0000001125-0b8d2729da1dc3f12ce537cf551ec4d7cb7896c825731e7683f5c64dcf8f52fd:
0000001125-0b8d2729da1dc3f12ce537cf551ec4d7cb7896c825731e7683f5c64dcf8f52fd-
0000001125-0b8d2729da1dc3f12ce537cf551ec4d7cb7896c825731e7683f5c64dcf8f52fd-
Ignore-this: be0408712088064c264fe4c8324e8809
--
0000001299-a02daa62696338693eaf8e83c0fbed7c7dd3f0c939346356deaca6938900c2bd:
0000001299-a02daa62696338693eaf8e83c0fbed7c7dd3f0c939346356deaca6938900c2bd-
0000001299-a02daa62696338693eaf8e83c0fbed7c7dd3f0c939346356deaca6938900c2bd-
Ignore-this: be0408712088064c264fe4c8324e8809
--
unrevert:[TAG pycryptopp-0.5.16
unrevert-zooko at zooko.com**20090727125049
unrevert- Ignore-this: be0408712088064c264fe4c8324e8809
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
grep -B4 -Ee"a02daa62696338693eaf8e83c0fbed7c7dd3f0c939346356deaca6938900c2bd|
../hashed_inventory-[TAG pycryptopp-0.5.16
../hashed_inventory-zooko at zooko.com**20090727125049
../hashed_inventory- Ignore-this: be0408712088064c264fe4c8324e8809
../hashed_inventory-]
../hashed_inventory:hash:
0000001125-0b8d2729da1dc3f12ce537cf551ec4d7cb7896c825731e7683f5c64dcf8f52fd
--
../hashed_inventory-[TAG pycryptopp-0.5.17
../hashed_inventory-zooko at zooko.com**20090916031341
../hashed_inventory- Ignore-this: 68baf5231e68b10aa649733cc0603529
../hashed_inventory-]
../hashed_inventory:hash: 0000001299-
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
grep -A2 "pycryptopp-0.5.17" *
0000000603-ee98ff8d5b2582075318fa446a30bcce6896ad966d432d910821d2f815684228:+
* release pycryptopp-0.5.17
0000000603-ee98ff8d5b2582075318fa446a30bcce6896ad966d432d910821d2f815684228-+
0000000603-ee98ff8d5b2582075318fa446a30bcce6896ad966d432d910821d2f815684228-+
* publickey/rsamodule.cpp, publickey/ecdsamodule.cpp, hash/sha256module.cpp,
cipher/aesmodule.cpp: fix a segfault bug when sizeof(size_t) > sizeof(int) (not
exploitable); thanks Nathan Wilcox and Brian Warner. ticket #19 2009-09-15
Zooko O'Whielacronx <zooko at zooko.com>
--
0000001299-a02daa62696338693eaf8e83c0fbed7c7dd3f0c939346356deaca6938900c2bd:
0000001299-a02daa62696338693eaf8e83c0fbed7c7dd3f0c939346356deaca6938900c2bd-
0000001299-a02daa62696338693eaf8e83c0fbed7c7dd3f0c939346356deaca6938900c2bd-
Ignore-this: 68baf5231e68b10aa649733cc0603529
--
unrevert:[TAG pycryptopp-0.5.17
unrevert-zooko at zooko.com**20090916031341
unrevert- Ignore-this: 68baf5231e68b10aa649733cc0603529
Oh! At last a tag that has only one patch associated with it!
Oh, but that's probably because I haven't created any new tags since then.
Let's see what happens if I create one...
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
darcs tag bogus-tag-debugging-issue1669
Finished tagging patch 'TAG bogus-tag-debugging-issue1669'
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
grep -A2 "bogus-tag-" *
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
Huh ??
Oh, the newly created patches are gzipped:
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
zgrep -A2 "bogus-tag-" *
0000003602-b52b4473beb7912e3b574257030c115cc7a5ac2bbe697c0cb36a044c19a18e29:
0000003602-
m**20100113051216
0000003602-b52b4473beb7912e3b574257030c115cc7a5ac2bbe697c0cb36a044c19a18e29:
Ignore-this: 671d334dc954fc71ced129c7584d5482
HACK yukyuk:~/playground/pycryptopp/7zfrombug1669/pycryptopp/_darcs/patches$
zgrep -Ee"671d334dc954fc71ced129c7584d5482|20100113051216|
Hm, well I seem to be free of the curse.
Now however can I repair this repository? I really need to fix it so I can
commit a bunch of improvements to pycryptopp, and it is kind of urgent because
we're trying to get Tahoe-LAFS into Ubuntu Lucid 10.04 LTS and the deadline is
next week.
I don't understand if Kowey's advice on repairing a patch that had extra
whitespace is still sufficient in light of all this weirdness with colliding
patches, and also I didn't understand how to effect that change.
__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue1669>
__________________________________
More information about the darcs-devel
mailing list