##// END OF EJS Templates
Change the size of the short hash representation...
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-----

File last commit:

r350:b4e0e206 merge default
r373:67081329 default
Show More
test-up-local-change.out
70 lines | 1.3 KiB | text/plain | TextLexer
/ tests / test-up-local-change.out
+ mkdir r1
+ cd r1
+ hg init
+ echo a
+ hg addremove
+ hg commit -t 1 -u test -d '0 0'
+ cd ..
+ mkdir r2
+ cd r2
+ hg init ../r1
+ hg up
+ echo abc
+ hg diff
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-a
+abc
+ cd ../r1
+ echo b
+ echo a2
+ hg addremove
+ hg commit -t 2 -u test -d '0 0'
+ cd ../r2
+ hg -q pull ../r1
+ hg status
C a
+ hg -d up
resolving manifests
ancestor a0c8bcbb local a0c8bcbb remote 1165e8bd
a versions differ, resolve
remote created b
getting b
merging a
resolving a
file a: other d730145a ancestor b789fdd9
+ hg -d up -m
resolving manifests
ancestor 1165e8bd local 1165e8bd remote 1165e8bd
+ hg parents
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
user: test
date: Wed Dec 31 16:00:00 1969
summary: 2
+ hg -v history
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
user: test
date: Wed Dec 31 16:00:00 1969
files: a b
description:
2
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
user: test
date: Wed Dec 31 16:00:00 1969
files: a
description:
1
+ hg diff
+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-a2
+abc