1 % no working directory |
|
2 adding a |
|
3 adding b |
|
4 adding c |
|
5 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
6 adding c |
|
7 created new head |
|
8 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 % hg parents |
|
10 changeset: 3:02d851b7e549 |
|
11 user: test |
|
12 date: Thu Jan 01 00:00:03 1970 +0000 |
|
13 summary: c |
|
14 |
|
15 % hg parents a |
|
16 changeset: 1:d786049f033a |
|
17 user: test |
|
18 date: Thu Jan 01 00:00:01 1970 +0000 |
|
19 summary: a |
|
20 |
|
21 % hg parents c, single revision |
|
22 changeset: 3:02d851b7e549 |
|
23 user: test |
|
24 date: Thu Jan 01 00:00:03 1970 +0000 |
|
25 summary: c |
|
26 |
|
27 % hg parents -r 3 c |
|
28 abort: 'c' not found in manifest! |
|
29 % hg parents -r 2 |
|
30 changeset: 1:d786049f033a |
|
31 user: test |
|
32 date: Thu Jan 01 00:00:01 1970 +0000 |
|
33 summary: a |
|
34 |
|
35 % hg parents -r 2 a |
|
36 changeset: 1:d786049f033a |
|
37 user: test |
|
38 date: Thu Jan 01 00:00:01 1970 +0000 |
|
39 summary: a |
|
40 |
|
41 % hg parents -r 2 ../a |
|
42 abort: ../a not under root |
|
43 % cd dir; hg parents -r 2 ../a |
|
44 changeset: 1:d786049f033a |
|
45 user: test |
|
46 date: Thu Jan 01 00:00:01 1970 +0000 |
|
47 summary: a |
|
48 |
|
49 % hg parents -r 2 path:a |
|
50 changeset: 1:d786049f033a |
|
51 user: test |
|
52 date: Thu Jan 01 00:00:01 1970 +0000 |
|
53 summary: a |
|
54 |
|
55 % hg parents -r 2 glob:a |
|
56 abort: can only specify an explicit filename |
|
57 % merge working dir with 2 parents, hg parents c |
|
58 merging c |
|
59 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
60 (branch merge, don't forget to commit) |
|
61 changeset: 3:02d851b7e549 |
|
62 user: test |
|
63 date: Thu Jan 01 00:00:03 1970 +0000 |
|
64 summary: c |
|
65 |
|
66 changeset: 4:48cee28d4b4e |
|
67 tag: tip |
|
68 parent: 1:d786049f033a |
|
69 user: test |
|
70 date: Thu Jan 01 00:00:04 1970 +0000 |
|
71 summary: c2 |
|
72 |
|
73 % merge working dir with 1 parent, hg parents |
|
74 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
76 (branch merge, don't forget to commit) |
|
77 changeset: 2:6cfac479f009 |
|
78 user: test |
|
79 date: Thu Jan 01 00:00:02 1970 +0000 |
|
80 summary: b |
|
81 |
|
82 changeset: 4:48cee28d4b4e |
|
83 tag: tip |
|
84 parent: 1:d786049f033a |
|
85 user: test |
|
86 date: Thu Jan 01 00:00:04 1970 +0000 |
|
87 summary: c2 |
|
88 |
|
89 % merge working dir with 1 parent, hg parents c |
|
90 changeset: 4:48cee28d4b4e |
|
91 tag: tip |
|
92 parent: 1:d786049f033a |
|
93 user: test |
|
94 date: Thu Jan 01 00:00:04 1970 +0000 |
|
95 summary: c2 |
|
96 |
|