Mercurial > hg

annotate tests/test-rename-merge1.out @ 5353:9c0f864fddca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 30 Sep 2007 12:36:11 +0200
parents f191bc3916f7
children 17ed9b9a0d03
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
4674
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
7 a2: divergent renames -> dr
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3652
diff changeset
8 a: remote moved to b -> m
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 b2: remote created -> g
5042
f191bc3916f7 merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents: 4674
diff changeset
10 copying a to b
3311
966632304dde merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents: 3308
diff changeset
11 merging a and b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
12 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
13 removing a
4674
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
14 warning: detected divergent renames of a2 to:
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
15 c2
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
16 b2
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
17 getting b2
3251
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
18 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
19 (branch merge, don't forget to commit)
3251
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
20 M b
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
21 a
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
22 M b2
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
23 R a
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
24 C c2
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
25 blahblah
3292
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3252
diff changeset
26 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
27 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
28 1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98
3652
f4dece0f7016 refactor debugrenamed
Matt Mackall <mpm@selenic.com>
parents: 3314
diff changeset
29 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66