Mercurial > hg

annotate tests/test-rename-merge1.out @ 5489:3ab405e070bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Honour the exec bit when we go back in time. Fixes issue801.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 05 Nov 2007 18:49:35 -0200
parents 17ed9b9a0d03
children c2a21fe60994
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3153
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
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
5 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
6 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
7 searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
8 unmatched files in local:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
9 c2
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
10 unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
11 b
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
12 b2
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
13 all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
14 c2 -> a2
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
15 b -> a *
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
16 b2 -> a2
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
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: 3652
diff changeset
19 a: remote moved to b -> m
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
20 b2: remote created -> g
5042
f191bc3916f7 merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents: 4674
diff changeset
21 copying a to b
3311
966632304dde merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents: 3308
diff changeset
22 merging a and b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
23 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
3251
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
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
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
28 getting b2
3251
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
29 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
30 (branch merge, don't forget to commit)
3251
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
31 M b
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
32 a
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
33 M b2
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
34 R a
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
35 C c2
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
36 blahblah
3292
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3252
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: 3252
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: 3252
diff changeset
39 1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98
3652
f4dece0f7016 refactor debugrenamed
Matt Mackall <mpm@selenic.com>
parents: 3314
diff changeset
40 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66