equal
deleted
inserted
replaced
11 hg ci -Amab -d '0 0' |
11 hg ci -Amab -d '0 0' |
12 echo a >> a |
12 echo a >> a |
13 hg ci -Ama -d '1 0' |
13 hg ci -Ama -d '1 0' |
14 echo b >> b |
14 echo b >> b |
15 hg ci -Amb -d '2 0' |
15 hg ci -Amb -d '2 0' |
|
16 echo c > c |
|
17 hg ci -Amc -d '3 0' |
|
18 hg up -C 1 |
|
19 echo d > c |
|
20 hg ci -Amc2 -d '4 0' |
|
21 hg up -C 3 |
16 |
22 |
17 echo % hg parents |
23 echo % hg parents |
18 hg parents |
24 hg parents |
19 |
25 |
20 echo % hg parents a |
26 echo % hg parents a |
21 hg parents a |
27 hg parents a |
|
28 |
|
29 echo % hg parents c, single revision |
|
30 hg parents c |
|
31 |
|
32 echo % hg parents -r 3 c |
|
33 hg parents -r 3 c |
22 |
34 |
23 echo % hg parents -r 2 |
35 echo % hg parents -r 2 |
24 hg parents -r 2 |
36 hg parents -r 2 |
25 |
37 |
26 echo % hg parents -r 2 a |
38 echo % hg parents -r 2 a |
39 |
51 |
40 echo '% hg parents -r 2 glob:a' |
52 echo '% hg parents -r 2 glob:a' |
41 cd .. |
53 cd .. |
42 hg parents -r 2 glob:a |
54 hg parents -r 2 glob:a |
43 |
55 |
|
56 echo % merge working dir with 2 parents, hg parents c |
|
57 HGMERGE=true hg merge |
|
58 hg parents c |
|
59 |
|
60 echo % merge working dir with 1 parent, hg parents |
|
61 hg up -C 2 |
|
62 HGMERGE=true hg merge -r 4 |
|
63 hg parents |
|
64 echo % merge working dir with 1 parent, hg parents c |
|
65 hg parents c |
|
66 |
44 true |
67 true |