Wed, 15 Jun 2005 21:13:08 -0800 Show nice short hashes in hgweb
mpm@selenic.com [Wed, 15 Jun 2005 21:13:08 -0800] rev 375
Show nice short hashes in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show nice short hashes in hgweb manifest hash: c73a8e32a823af7ea7440d1db2b0c022a4366bb5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQpkywK+sNU5EO8RAmSIAJ40aYEFBi07drKuPLuofXNaUkEFtgCghC9g mG8mmhucbBe4hcZWL0AdG8I= =Khp7 -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 21:12:28 -0800 update tests to reflect new short hash length
mpm@selenic.com [Wed, 15 Jun 2005 21:12:28 -0800] rev 374
update tests to reflect new short hash length -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update tests to reflect new short hash length manifest hash: 7ae99e74333416e8cbf8bc5d518bb5d3c449788b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQo8ywK+sNU5EO8RAltAAJ97yqgcTU0eYrQ2vpIq+hrfCfrsVwCggUk4 adIvEe7OzGeG6wn0/aRoQXY= =h8+W -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 21:11:40 -0800 Change the size of the short hash representation
mpm@selenic.com [Wed, 15 Jun 2005 21:11:40 -0800] rev 373
Change the size of the short hash representation -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Change the size of the short hash representation First note that this number doesn't really matter, as we always check for ambiguous short hash ids. Here's the math on collision probability: >>> import math >>> def p(f, n): return 1 - (1 / math.exp(n**2/(2*f))) ... >>> p(2**32, 30000.0) 0.09947179164613551 # with 30000 changesets (BKCVS), we have a 9% chance >>> p(2**32, 65000.0) 0.38850881217977273 # and with a full import from BK, we'd have a 39% chance >>> p(2**40, 1e6) 0.36539171908447321 # we'd like to be "safe" for 1M csets, so 40 isn't enough >>> p(2**48, 1e6) 0.001774780051374103 # But 48 looks good >>> p(2**48, 1e7) 0.16275260939624481 >>> p(2**48, 5e6) 0.043437281083569146 >>> p(2**48, 2e6) 0.0070802434913129764 >>> p(2**48, 3e6) 0.01586009440574343 manifest hash: 24d9f928a463f46708b0e11fb781d5a241851424 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQoMywK+sNU5EO8RAoBBAJwII9GV6dT9QUOYAk3gZGw9z0JvjACfSI4q IFnTu1F7P5OuLelO1GsM8Bs= =CNWk -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 19:58:48 -0800 Move httprangereader into its own file
mpm@selenic.com [Wed, 15 Jun 2005 19:58:48 -0800] rev 372
Move httprangereader into its own file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Move httprangereader into its own file manifest hash: 7a856e4024ce5d3d305e23e418a77d3058c74ddf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsPj4ywK+sNU5EO8RAizKAJ9kbYVAC+iL4cKml14BcwX9okdnJQCgjLAP cWM5/y9FdC3THOC6DkUNic0= =PkL6 -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 19:52:41 -0800 hg push: "default-push" default target path
mpm@selenic.com [Wed, 15 Jun 2005 19:52:41 -0800] rev 371
hg push: "default-push" default target path -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg push: "default-push" default target path manifest hash: 368f3a073e172272bac06bf5b2ace78f03ffd3bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsPeJywK+sNU5EO8RAuNZAKChSFEUCILHmRJmj3/7EDij3RK31gCdF2qF vQ8+72bbEPmxa3HOTdNliu0= =Nyi+ -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 19:48:04 -0800 revlog: add a children function
mpm@selenic.com [Wed, 15 Jun 2005 19:48:04 -0800] rev 370
revlog: add a children function -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 revlog: add a children function manifest hash: eda39cb99d0df5b3262d97a9e161a8acceb1da3d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsPZ0ywK+sNU5EO8RAiAcAJ9D+y8zQ/Gai7CpTkfTamPFxmvVRACcDRv9 5HkupYyrxslGnGJpELaF1is= =zf1d -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 19:23:09 -0800 hgweb: fix deleted file in changeset key error
mpm@selenic.com [Wed, 15 Jun 2005 19:23:09 -0800] rev 369
hgweb: fix deleted file in changeset key error -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: fix deleted file in changeset key error We simply point to nullid. This is very arguably the correct thing to do. manifest hash: c16f1c05a087e5d3274cb84dfd09d048430f0495 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsPCdywK+sNU5EO8RAuJzAJ9j2Yn7KHceFxYgKvOd5V4fNNLKmQCfTZ9s jorkRZcX2hdZqRkxM8q8VMk= =+bEb -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 17:35:09 -0800 Add a TODO list
mpm@selenic.com [Wed, 15 Jun 2005 17:35:09 -0800] rev 368
Add a TODO list -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a TODO list manifest hash: 6d50020153a16e9f746e65c177b15e44a6110ddc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsNdNywK+sNU5EO8RAnCMAJ9Km7f0Dx8cccH44R20qqHCuBobpwCeIfuh bBtBTknenXsF4bEo3Z6BOt4= =b/zU -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 17:18:06 -0800 Use errno.EPIPE rather than 32
mpm@selenic.com [Wed, 15 Jun 2005 17:18:06 -0800] rev 367
Use errno.EPIPE rather than 32 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use errno.EPIPE rather than 32 manifest hash: c9cb2fadf7ef4392b2f16b3f76ca2a39964b7ae0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsNNOywK+sNU5EO8RAudrAKCGKfgsHmSLdt5HYpUtX4S/QSFCQgCeKb7M Qld4CLe1M3aktU0tugb51Gs= =1LB7 -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 17:15:38 -0800 hgweb: remove pointless manifest reads
mpm@selenic.com [Wed, 15 Jun 2005 17:15:38 -0800] rev 366
hgweb: remove pointless manifest reads -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: remove pointless manifest reads pointed out by Goffredo Baroncelli manifest hash: 7aa5b93dc73755f02887702d0a01118d91b3b289 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsNK6ywK+sNU5EO8RAhJeAJ9ck6KYdupiuuyXXU5Mr8upx+D/NgCcDJmI y7ZVFQoiaYFoJy+GWQ2zFes= =RHPt -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 15:58:53 -0800 One too many newlines in verbose output showed up in regression
mpm@selenic.com [Wed, 15 Jun 2005 15:58:53 -0800] rev 365
One too many newlines in verbose output showed up in regression -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 One too many newlines in verbose output showed up in regression manifest hash: 184bd0353358ec24c3711420ba3c6745a688ebc9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsMC9ywK+sNU5EO8RAuYsAJ4wCphPRGI5omFy0VkbiQp8OairRwCcDdD2 pAR58+i+urS7MlbaDisCYUM= =Ty7w -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 15:58:11 -0800 test-help: hg copy now shows up in the help
mpm@selenic.com [Wed, 15 Jun 2005 15:58:11 -0800] rev 364
test-help: hg copy now shows up in the help -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 test-help: hg copy now shows up in the help manifest hash: f5a8f55f2e87e363c22e1639eef4a919ed028d4e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsMCTywK+sNU5EO8RAg0UAKCtCVRkgxqjfHGIbaz1DTZ+FJgXdQCgrfkq i4W+etRh5HWatXrjw+n7Ppk= =4lE7 -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 15:57:07 -0800 Add hg copy
mpm@selenic.com [Wed, 15 Jun 2005 15:57:07 -0800] rev 363
Add hg copy -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add hg copy extend dirstate to remember copies add copy command add copy repo operation write copy metadata with commit manifest hash: 9f42c7b4a2400d35807b5f18c05a31814fa3e375 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsMBTywK+sNU5EO8RAjXpAJ9fvNtTP1A/4veqFWQHcWGro7buyACgoVXz /ngGOFowxS/zGkvUvGavYGQ= =drb1 -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 15:50:28 -0800 run-tests: run tests given on the command line
mpm@selenic.com [Wed, 15 Jun 2005 15:50:28 -0800] rev 362
run-tests: run tests given on the command line -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 run-tests: run tests given on the command line manifest hash: e0217e478de902d0de7b9a294509718365f1d837 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsL7EywK+sNU5EO8RAiGJAJ92ZB/+N8+XnOt717cuADK9ajQ+lwCfW1LG 02mjQ04uoS0n+D8xi0KX9tM= =d1lZ -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 15:49:20 -0800 Fix another sortdiff cornercase
mpm@selenic.com [Wed, 15 Jun 2005 15:49:20 -0800] rev 361
Fix another sortdiff cornercase -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix another sortdiff cornercase manifest hash: 32b2d1750689c561c9471fb68a9f3571364399cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsL6AywK+sNU5EO8RAhaeAJ4zw18vo4oGTvymplKb7olKEeg0aQCfVxX1 2o/PcrE6EeboHpQn5E0Wb/Y= =eENW -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 13:04:05 -0800 filelog: add metadata support
mpm@selenic.com [Wed, 15 Jun 2005 13:04:05 -0800] rev 360
filelog: add metadata support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 filelog: add metadata support To add metadata, we add an escape sequence "\1\n" to indicate that some key:value metadata pairs follow. manifest hash: 9a019d50f8d389b2c16cb46f4eab62c136b70fd7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsJfFywK+sNU5EO8RAl1AAJ9BJPgDWnot5MUdPnzPiNxlyhG0rACfVo10 6q9fGaPUpf8mxefz7G8D0Z0= =1BL6 -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 10:20:26 -0800 hgweb: add file permissions
mpm@selenic.com [Wed, 15 Jun 2005 10:20:26 -0800] rev 359
hgweb: add file permissions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: add file permissions From: Goffredo Baroncelli <kreijack@libero.it> Show permissions in hgweb Tweaked by mpm manifest hash: f11361c6da21f3ba60c5e6a173396754c36efb1d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsHFqywK+sNU5EO8RAoqFAJ44P8kZoZDiY5Fw8LWpL/3ArXNE2QCeO3z4 0zV5rXWa/r/xgf+AVTLeQ/4= =FzLj -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 10:06:40 -0800 [PATCH] manifest.readflags performance buglet
mpm@selenic.com [Wed, 15 Jun 2005 10:06:40 -0800] rev 358
[PATCH] manifest.readflags performance buglet -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] manifest.readflags performance buglet From: Chris Mason <mason@suse.com> Performance buglet in manifest.readflags: only re-read the manifest when the mapcache is not present or does not correspond to this node manifest hash: 188ad778308a2e5c885d452d7b7e61c082e8ceb2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsG4wywK+sNU5EO8RAv+IAJ9sU87MythE/HYf3wH/V7ctzNdR1gCfclr9 ydsk6wtk/n6uKb4U7BvGvLM= =5cOx -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 10:05:45 -0800 [PATCH] Update hgit to the new commands.dodiff parameters
mpm@selenic.com [Wed, 15 Jun 2005 10:05:45 -0800] rev 357
[PATCH] Update hgit to the new commands.dodiff parameters -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Update hgit to the new commands.dodiff parameters From: Chris Mason <mason@suse.com> Update hgit to the new commands.dodiff parameters manifest hash: aa8d98036fae49ab1c1c0e65d86ab0e1bee0fa71 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsG35ywK+sNU5EO8RAhnoAJwMgK1QA8DkdbU2R19LoLRK1fmCaQCeN1dh 4fHRT4hf+Qi5fND4CpOyqBU= =63xo -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 10:04:42 -0800 hgit rev-list support
mpm@selenic.com [Wed, 15 Jun 2005 10:04:42 -0800] rev 356
hgit rev-list support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgit rev-list support From: Chris Mason <mason@suse.com> Update hgit rev-list support, make it a special case of hgit rev-tree Print newest commit first Add the ability to specify the max number of commits to print (-n or --max-nr=) Match git feature of stopping at a given commit (hgit rev-list start_commit sto\p_commit) manifest hash: b9bbd5e95dae771ebef89f8f4102e458052b1835 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsG26ywK+sNU5EO8RAm5OAJ46G1nhXN2kQ+cKaBOK+oX4zSdQRgCdECvG 6wbG0JRdm7S29K4ynzs4cyY= =pwpz -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 10:02:41 -0800 hg import: better file accounting
mpm@selenic.com [Wed, 15 Jun 2005 10:02:41 -0800] rev 355
hg import: better file accounting -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg import: better file accounting From: Chris Mason <mason@suse.com> Change hg import to call hg addremove with the file list to make sure files added/deleted by the patch are properly accounted for. Instead of using lsdiff, the output of patch is parsed directly to find the file list. manifest hash: defed8cb90d6f976fb47949ac03dc4b88870ba77 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsG1BywK+sNU5EO8RAvV9AJ9H25L5vdnZB1xpAakuN3tGuMfRfgCfdAgP 3xBc3S4F74/7DdS2GXRNhGw= =oXXT -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 10:01:15 -0800 hg commit: add -A flag
mpm@selenic.com [Wed, 15 Jun 2005 10:01:15 -0800] rev 354
hg commit: add -A flag -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg commit: add -A flag From: Chris Mason <mason@suse.com> Add hg commit -A that calls hg addremove before trying to run the commit manifest hash: d25cb3ab4e0dc2e8642bcbef32da4ab178cd4823 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsGzrywK+sNU5EO8RAvdFAJ46ZjyACMvKEUq8RmdxZB9ZE0z6ygCfYYzq UP2EXTOQ2pdhxKFyad8h/Rg= =wzZD -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 10:00:10 -0800 hg addremove: take optional files list
mpm@selenic.com [Wed, 15 Jun 2005 10:00:10 -0800] rev 353
hg addremove: take optional files list -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg addremove: take optional files list From: Chris Mason <mason@suse.com> Change hg addremove so that it can take a list of files to process instead of searching the entire tree for candidates. manifest hash: 592d8771ea5703dd6ed4459239dab84e15ee9321 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsGyqywK+sNU5EO8RAt0jAKCSDQ1fxgQNP08kehdxlQwX5DUuuQCgqRB2 7gZoRNyJmOy5BVp6VBmUJbw= =THQB -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 09:50:00 -0800 ignore files associated with quilt
mpm@selenic.com [Wed, 15 Jun 2005 09:50:00 -0800] rev 352
ignore files associated with quilt -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 ignore files associated with quilt manifest hash: f0da2c0465fb27005d5bde30e0171ae9a76951d0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsGpIywK+sNU5EO8RAi+uAJ4/cXWFBnXoLHH8bN8Xbe/nzXHycgCfQkO2 WdEoWI4YpiNQ+s5id6Xxphw= =6cXJ -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 00:50:44 -0800 hgweb: change number navigation tidy up
mpm@selenic.com [Wed, 15 Jun 2005 00:50:44 -0800] rev 351
hgweb: change number navigation tidy up -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: change number navigation tidy up manifest hash: 9fe0ad4fba9a7a0d4c604299024ce7732198c831 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+vkywK+sNU5EO8RAiOyAJ92O9ALuJTbVPPGC/x6vL6yK7GggwCgs4ta 5StdA4D/dOEUvN6O3xicKhk= =fP4C -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 00:33:57 -0800 Merge with TAH
mpm@selenic.com [Wed, 15 Jun 2005 00:33:57 -0800] rev 350
Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: ec82cc2d7b7357fd7db4917e09d7d6865482de58 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+f1ywK+sNU5EO8RAuPtAJ0WilDBo3iG4S/dmIabhzYW987TtgCgkjkM 8OmatsrjG01iJAhkKJj+XnQ= =mOLr -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 08:32:29 +0100 Merged with mercurial-identify (which includes upstream's current tip)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 15 Jun 2005 08:32:29 +0100] rev 349
Merged with mercurial-identify (which includes upstream's current tip) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merged with mercurial-identify (which includes upstream's current tip) manifest hash: b135d201757b84bbe7f14a446d2b001fd0cc1aa2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCr9mNW7P1GVgWeRoRAmTjAJ919wnvZXbKI27N0cDJCrumR3z4rQCcD6PO yZTmrT6p+gt6GBO+j5FVBn0= =HWn8 -----END PGP SIGNATURE-----
Tue, 14 Jun 2005 08:49:52 +0100 Improved hgeditor:
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 14 Jun 2005 08:49:52 +0100] rev 348
Improved hgeditor: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Improved hgeditor: hgeditor now uses $EDITOR and sets options according to emacs/vim/... Cleanup of temporary files. Use simple 'hg diff' instead of calling it for every file. Call gpg only if commit message was changed. manifest hash: 5c56bf580f9c2ef2a7d8b680bfb73fdd3b232044 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCrowgW7P1GVgWeRoRApiOAJ0UI9/OY3yr4bv0no+KCcponSq+ZwCdFDUU No8t9ni6/72zmlcpB13E63A= =oSyb -----END PGP SIGNATURE-----
Tue, 14 Jun 2005 08:01:18 +0100 Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 14 Jun 2005 08:01:18 +0100] rev 347
Cleaned up show_changeset() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Cleaned up show_changeset() manifest hash: f9aa30cfa465d7aa096abb652ec04f1a5ec1072f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCroC+W7P1GVgWeRoRAuheAJsEx7eFaoHoz+YejLIiN4BSfE117ACfYdM6 NQGNTp3ftUSuVpcMLvV8A1U= =8Ihb -----END PGP SIGNATURE-----
Wed, 15 Jun 2005 00:27:20 -0800 merge3: fix argument order
mpm@selenic.com [Wed, 15 Jun 2005 00:27:20 -0800] rev 346
merge3: fix argument order -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge3: fix argument order We were passing the wrong argument order to hgmerge. Add a merge conflict test case. manifest hash: 2d88786a3f31dcaa9d44f564c21f0d2a4f14f09c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCr+ZoywK+sNU5EO8RAouJAKCOx5oxhVXkLqsfCPBXx0+wP5IeogCYoZzF ooZT2fyN3tL3uVM2YP8KcA== =O4fE -----END PGP SIGNATURE-----
(0) -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 tip