Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rename-merge1.out @ 5452:82b4ff3abbcd
bdiff: tweaks for large files
- adjust the common line threshold to .1%
this speeds up a delta of 7M lines of source from 10m to 40s
- adjust the scaling of the hash array down a bit as it was raising the peak
memory usage significantly
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 11 Oct 2007 00:46:56 -0500 |
| parents | 17ed9b9a0d03 |
| children |
| rev | line source |
|---|---|
|
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 checkout |
|
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 merge |
|
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 resolving manifests |
| 3320 | 5 overwrite None partial False |
| 6 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 | |
|
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
7 searching for copies back to rev 1 |
|
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
8 unmatched files in local: |
|
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
9 c2 |
|
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
10 unmatched files in other: |
|
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
11 b |
|
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
12 b2 |
|
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
13 all copies found (* = to merge, ! = divergent): |
|
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
14 c2 -> a2 |
|
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
15 b -> a * |
|
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
16 b2 -> a2 |
|
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
17 checking for directory renames |
|
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
18 a2: divergent renames -> dr |
|
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3659
diff
changeset
|
19 a: remote moved to b -> m |
|
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
20 b2: remote created -> g |
|
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4674
diff
changeset
|
21 copying a to b |
|
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
22 merging a and b |
| 3320 | 23 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c |
|
3257
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
24 removing a |
|
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
25 warning: detected divergent renames of a2 to: |
|
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
26 c2 |
|
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
27 b2 |
|
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
28 getting b2 |
|
3257
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
29 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
30 (branch merge, don't forget to commit) |
|
3257
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
31 M b |
|
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
32 a |
|
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
33 M b2 |
|
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
34 R a |
|
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
35 C c2 |
|
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
36 blahblah |
|
3295
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3280
diff
changeset
|
37 rev offset length base linkrev nodeid p1 p2 |
|
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3280
diff
changeset
|
38 0 0 67 0 1 dc51707dfc98 000000000000 000000000000 |
|
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3280
diff
changeset
|
39 1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98 |
| 3659 | 40 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 |