Show More
@@ -1,67 +1,149 b'' | |||||
1 | #!/bin/sh |
|
1 | test parents command | |
2 | # test parents command |
|
2 | ||
|
3 | $ hg init repo | |||
|
4 | $ cd repo | |||
|
5 | ||||
|
6 | no working directory | |||
|
7 | ||||
|
8 | $ hg parents | |||
3 |
|
9 | |||
4 | hg init repo |
|
10 | $ echo a > a | |
5 | cd repo |
|
11 | $ echo b > b | |
6 | echo % no working directory |
|
12 | $ hg ci -Amab -d '0 0' | |
7 | hg parents |
|
13 | adding a | |
|
14 | adding b | |||
|
15 | $ echo a >> a | |||
|
16 | $ hg ci -Ama -d '1 0' | |||
|
17 | $ echo b >> b | |||
|
18 | $ hg ci -Amb -d '2 0' | |||
|
19 | $ echo c > c | |||
|
20 | $ hg ci -Amc -d '3 0' | |||
|
21 | adding c | |||
|
22 | $ hg up -C 1 | |||
|
23 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
24 | $ echo d > c | |||
|
25 | $ hg ci -Amc2 -d '4 0' | |||
|
26 | adding c | |||
|
27 | created new head | |||
|
28 | $ hg up -C 3 | |||
|
29 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
30 | ||||
8 |
|
31 | |||
9 | echo a > a |
|
32 | $ hg parents | |
10 | echo b > b |
|
33 | changeset: 3:02d851b7e549 | |
11 | hg ci -Amab -d '0 0' |
|
34 | user: test | |
12 | echo a >> a |
|
35 | date: Thu Jan 01 00:00:03 1970 +0000 | |
13 | hg ci -Ama -d '1 0' |
|
36 | summary: c | |
14 | echo b >> b |
|
37 | ||
15 | hg ci -Amb -d '2 0' |
|
38 | ||
16 | echo c > c |
|
39 | $ hg parents a | |
17 | hg ci -Amc -d '3 0' |
|
40 | changeset: 1:d786049f033a | |
18 | hg up -C 1 |
|
41 | user: test | |
19 | echo d > c |
|
42 | date: Thu Jan 01 00:00:01 1970 +0000 | |
20 | hg ci -Amc2 -d '4 0' |
|
43 | summary: a | |
21 | hg up -C 3 |
|
44 | ||
|
45 | ||||
|
46 | hg parents c, single revision | |||
22 |
|
47 | |||
23 |
|
|
48 | $ hg parents c | |
24 | hg parents |
|
49 | changeset: 3:02d851b7e549 | |
|
50 | user: test | |||
|
51 | date: Thu Jan 01 00:00:03 1970 +0000 | |||
|
52 | summary: c | |||
|
53 | ||||
25 |
|
54 | |||
26 |
|
|
55 | $ hg parents -r 3 c | |
27 | hg parents a |
|
56 | abort: 'c' not found in manifest! | |
28 |
|
57 | |||
29 | echo % hg parents c, single revision |
|
58 | $ hg parents -r 2 | |
30 | hg parents c |
|
59 | changeset: 1:d786049f033a | |
|
60 | user: test | |||
|
61 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
62 | summary: a | |||
|
63 | ||||
31 |
|
64 | |||
32 |
|
|
65 | $ hg parents -r 2 a | |
33 | hg parents -r 3 c |
|
66 | changeset: 1:d786049f033a | |
|
67 | user: test | |||
|
68 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
69 | summary: a | |||
|
70 | ||||
|
71 | ||||
|
72 | $ hg parents -r 2 ../a | |||
|
73 | abort: ../a not under root | |||
|
74 | ||||
34 |
|
75 | |||
35 |
|
|
76 | cd dir; hg parents -r 2 ../a | |
36 | hg parents -r 2 |
|
|||
37 |
|
||||
38 | echo % hg parents -r 2 a |
|
|||
39 | hg parents -r 2 a |
|
|||
40 |
|
77 | |||
41 | echo % hg parents -r 2 ../a |
|
78 | $ mkdir dir | |
42 | hg parents -r 2 ../a |
|
79 | $ cd dir | |
|
80 | $ hg parents -r 2 ../a | |||
|
81 | changeset: 1:d786049f033a | |||
|
82 | user: test | |||
|
83 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
84 | summary: a | |||
|
85 | ||||
|
86 | $ hg parents -r 2 path:a | |||
|
87 | changeset: 1:d786049f033a | |||
|
88 | user: test | |||
|
89 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
90 | summary: a | |||
|
91 | ||||
|
92 | $ cd .. | |||
43 |
|
93 | |||
44 |
|
|
94 | $ hg parents -r 2 glob:a | |
45 | mkdir dir |
|
95 | abort: can only specify an explicit filename | |
46 | cd dir |
|
|||
47 | hg parents -r 2 ../a |
|
|||
48 |
|
96 | |||
49 | echo '% hg parents -r 2 path:a' |
|
97 | ||
50 | hg parents -r 2 path:a |
|
98 | merge working dir with 2 parents, hg parents c | |
51 |
|
99 | |||
52 | echo '% hg parents -r 2 glob:a' |
|
100 | $ HGMERGE=true hg merge | |
53 | cd .. |
|
101 | merging c | |
54 | hg parents -r 2 glob:a |
|
102 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
|
103 | (branch merge, don't forget to commit) | |||
|
104 | $ hg parents c | |||
|
105 | changeset: 3:02d851b7e549 | |||
|
106 | user: test | |||
|
107 | date: Thu Jan 01 00:00:03 1970 +0000 | |||
|
108 | summary: c | |||
|
109 | ||||
|
110 | changeset: 4:48cee28d4b4e | |||
|
111 | tag: tip | |||
|
112 | parent: 1:d786049f033a | |||
|
113 | user: test | |||
|
114 | date: Thu Jan 01 00:00:04 1970 +0000 | |||
|
115 | summary: c2 | |||
|
116 | ||||
55 |
|
117 | |||
56 | echo % merge working dir with 2 parents, hg parents c |
|
118 | ||
57 | HGMERGE=true hg merge |
|
119 | merge working dir with 1 parent, hg parents | |
58 | hg parents c |
|
|||
59 |
|
120 | |||
60 | echo % merge working dir with 1 parent, hg parents |
|
121 | $ hg up -C 2 | |
61 | hg up -C 2 |
|
122 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
62 | HGMERGE=true hg merge -r 4 |
|
123 | $ HGMERGE=true hg merge -r 4 | |
63 | hg parents |
|
124 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
64 | echo % merge working dir with 1 parent, hg parents c |
|
125 | (branch merge, don't forget to commit) | |
65 |
hg parents |
|
126 | $ hg parents | |
|
127 | changeset: 2:6cfac479f009 | |||
|
128 | user: test | |||
|
129 | date: Thu Jan 01 00:00:02 1970 +0000 | |||
|
130 | summary: b | |||
|
131 | ||||
|
132 | changeset: 4:48cee28d4b4e | |||
|
133 | tag: tip | |||
|
134 | parent: 1:d786049f033a | |||
|
135 | user: test | |||
|
136 | date: Thu Jan 01 00:00:04 1970 +0000 | |||
|
137 | summary: c2 | |||
|
138 | ||||
66 |
|
139 | |||
67 | true |
|
140 | merge working dir with 1 parent, hg parents c | |
|
141 | ||||
|
142 | $ hg parents c | |||
|
143 | changeset: 4:48cee28d4b4e | |||
|
144 | tag: tip | |||
|
145 | parent: 1:d786049f033a | |||
|
146 | user: test | |||
|
147 | date: Thu Jan 01 00:00:04 1970 +0000 | |||
|
148 | summary: c2 | |||
|
149 |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now