Mercurial > hg > mercurial-crew-with-dirclash
annotate comparison.txt @ 1700:e2f91e0acbb8
hgmerge: add cleanup functions
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Mon, 06 Feb 2006 17:32:06 -0600 |
parents | 2073e5a71008 |
children |
rev | line source |
---|---|
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
1 Mercurial git BK (*) |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
2 storage revlog delta compressed revisions SCCS weave |
139 | 3 storage naming by filename by revision hash by filename |
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
4 merge file DAGs changeset DAG file DAGs? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
5 consistency SHA1 SHA1 CRC |
1308
2073e5a71008
Cleanup of tabs and trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
139
diff
changeset
|
6 signable? yes yes no |
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
7 |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
8 retrieve file tip O(1) O(1) O(revs) |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
9 add rev O(1) O(1) O(revs) |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
10 find prev file rev O(1) O(changesets) O(revs) |
139 | 11 annotate file O(revs) O(changesets) O(revs) |
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
12 find file changeset O(1) O(changesets) ? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
13 |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
14 checkout O(files) O(files) O(revs)? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
15 commit O(changes) O(changes) ? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
16 6 patches/s 6 patches/s slow |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
17 diff working dir O(changes) O(changes) ? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
18 < 1s < 1s ? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
19 tree diff revs O(changes) O(changes) ? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
20 < 1s < 1s ? |
139 | 21 hardlink clone O(files) O(revisions) O(files) |
22 | |
23 find remote csets O(log new) rsync: O(revisions) ? | |
24 git-http: O(changesets) | |
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
25 pull remote csets O(patch) O(modified files) O(patch) |
139 | 26 |
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
27 repo growth O(patch) O(revisions) O(patch) |
139 | 28 kernel history 300M 3.5G? 250M? |
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
29 lines of code 2500 6500 (+ cogito) ?? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
30 |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
31 * I've never used BK so this is just guesses |