equal
deleted
inserted
replaced
23 $ hg cp a c |
23 $ hg cp a c |
24 $ hg cp a d |
24 $ hg cp a d |
25 $ hg ci -m 'copy a to b, c, and d' |
25 $ hg ci -m 'copy a to b, c, and d' |
26 $ hg changesetcopies |
26 $ hg changesetcopies |
27 files: b c d |
27 files: b c d |
28 filesadded: 0\x001\x002 (esc) |
28 filesadded: 0 |
|
29 1 |
|
30 2 |
29 |
31 |
30 p1copies: 0\x00a (esc) |
32 p1copies: 0\x00a (esc) |
31 1\x00a (esc) |
33 1\x00a (esc) |
32 2\x00a (esc) |
34 2\x00a (esc) |
33 $ hg showcopies |
35 $ hg showcopies |
93 File 'f' exists only in p1, so 'i' should be from p1 |
95 File 'f' exists only in p1, so 'i' should be from p1 |
94 $ hg cp f i |
96 $ hg cp f i |
95 $ hg ci -m 'merge' |
97 $ hg ci -m 'merge' |
96 $ hg changesetcopies |
98 $ hg changesetcopies |
97 files: g h i |
99 files: g h i |
98 filesadded: 0\x001\x002 (esc) |
100 filesadded: 0 |
|
101 1 |
|
102 2 |
99 |
103 |
100 p1copies: 0\x00a (esc) |
104 p1copies: 0\x00a (esc) |
101 2\x00f (esc) |
105 2\x00f (esc) |
102 p2copies: 1\x00d (esc) |
106 p2copies: 1\x00d (esc) |
103 $ hg showcopies |
107 $ hg showcopies |