74 -huit |
74 -huit |
75 +eight |
75 +eight |
76 neuf |
76 neuf |
77 dix |
77 dix |
78 $ hg amend |
78 $ hg amend |
79 1 new orphan changesets |
79 1 new unstable changesets |
80 $ hg evolve |
80 $ hg evolve |
81 move:[2] babar count up to fifteen |
81 move:[2] babar count up to fifteen |
82 atop:[3] babar count up to ten |
82 atop:[4] babar count up to ten |
83 merging babar |
83 merging babar |
84 working directory is now at 71c18f70c34f |
84 working directory is now at 71c18f70c34f |
85 $ hg resolve -l |
85 $ hg resolve -l |
86 $ hg log -G |
86 $ hg log -G |
87 @ changeset: 4:71c18f70c34f |
87 @ changeset: 5:71c18f70c34f |
88 | tag: tip |
88 | tag: tip |
89 | user: test |
89 | user: test |
90 | date: Thu Jan 01 00:00:00 1970 +0000 |
90 | date: Thu Jan 01 00:00:00 1970 +0000 |
91 | summary: babar count up to fifteen |
91 | summary: babar count up to fifteen |
92 | |
92 | |
93 o changeset: 3:5977072d13c5 |
93 o changeset: 4:5977072d13c5 |
94 | parent: 0:29ec1554cfaf |
94 | parent: 0:29ec1554cfaf |
95 | user: test |
95 | user: test |
96 | date: Thu Jan 01 00:00:00 1970 +0000 |
96 | date: Thu Jan 01 00:00:00 1970 +0000 |
97 | summary: babar count up to ten |
97 | summary: babar count up to ten |
98 | |
98 | |
107 -------------------------------------------------- |
107 -------------------------------------------------- |
108 |
108 |
109 $ hg gdown |
109 $ hg gdown |
110 gdown have been deprecated in favor of previous |
110 gdown have been deprecated in favor of previous |
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
112 [3] babar count up to ten |
112 [4] babar count up to ten |
113 $ safesed 's/dix/ten/' babar |
113 $ safesed 's/dix/ten/' babar |
114 $ hg diff |
114 $ hg diff |
115 diff -r 5977072d13c5 babar |
115 diff -r 5977072d13c5 babar |
116 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
116 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
117 +++ b/babar Thu Jan 01 00:00:00 1970 +0000 |
117 +++ b/babar * (glob) |
118 @@ -7,4 +7,4 @@ |
118 @@ -7,4 +7,4 @@ |
119 sept |
119 sept |
120 eight |
120 eight |
121 neuf |
121 neuf |
122 -dix |
122 -dix |
123 +ten |
123 +ten |
124 $ hg amend |
124 $ hg amend |
125 1 new orphan changesets |
125 1 new unstable changesets |
126 $ hg evolve |
126 $ hg evolve |
127 move:[4] babar count up to fifteen |
127 move:[5] babar count up to fifteen |
128 atop:[5] babar count up to ten |
128 atop:[7] babar count up to ten |
129 merging babar |
129 merging babar |
130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
131 fix conflicts and see `hg help evolve.interrupted` |
131 fix conflicts and see `hg help evolve.interrupted` |
132 [1] |
132 [1] |
133 $ hg resolve -l |
133 $ hg resolve -l |
134 U babar |
134 U babar |
135 $ hg log -G |
135 $ hg log -G |
136 @ changeset: 5:e04690b09bc6 |
136 @ changeset: 7:e04690b09bc6 |
137 | tag: tip |
137 | tag: tip |
138 | parent: 0:29ec1554cfaf |
138 | parent: 0:29ec1554cfaf |
139 | user: test |
139 | user: test |
140 | date: Thu Jan 01 00:00:00 1970 +0000 |
140 | date: Thu Jan 01 00:00:00 1970 +0000 |
141 | summary: babar count up to ten |
141 | summary: babar count up to ten |
142 | |
142 | |
143 | o changeset: 4:71c18f70c34f |
143 | o changeset: 5:71c18f70c34f |
144 | | user: test |
144 | | user: test |
145 | | date: Thu Jan 01 00:00:00 1970 +0000 |
145 | | date: Thu Jan 01 00:00:00 1970 +0000 |
146 | | instability: orphan |
146 | | trouble: unstable |
147 | | summary: babar count up to fifteen |
147 | | summary: babar count up to fifteen |
148 | | |
148 | | |
149 | x changeset: 3:5977072d13c5 |
149 | x changeset: 4:5977072d13c5 |
150 |/ parent: 0:29ec1554cfaf |
150 |/ parent: 0:29ec1554cfaf |
151 | user: test |
151 | user: test |
152 | date: Thu Jan 01 00:00:00 1970 +0000 |
152 | date: Thu Jan 01 00:00:00 1970 +0000 |
153 | obsolete: amended using amend as 5:e04690b09bc6 |
153 | obsolete: amended as e04690b09bc6 |
154 | summary: babar count up to ten |
154 | summary: babar count up to ten |
155 | |
155 | |
156 o changeset: 0:29ec1554cfaf |
156 o changeset: 0:29ec1554cfaf |
157 user: test |
157 user: test |
158 date: Thu Jan 01 00:00:00 1970 +0000 |
158 date: Thu Jan 01 00:00:00 1970 +0000 |
159 summary: babar count up to five |
159 summary: babar count up to five |
160 |
160 |
161 (fix the conflict and continue) |
161 (fix the conflict and continue) |
162 |
162 |
163 $ hg revert -r 71c18f70c34f --all |
163 $ hg revert -r 5 --all |
164 reverting babar |
164 reverting babar |
165 $ safesed 's/dix/ten/' babar |
165 $ safesed 's/dix/ten/' babar |
166 $ hg resolve --all -m |
166 $ hg resolve --all -m |
167 (no more unresolved files) |
167 (no more unresolved files) |
168 continue: hg evolve --continue |
168 continue: hg evolve --continue |
169 $ hg evolve --continue |
169 $ hg evolve --continue |
170 evolving 4:71c18f70c34f "babar count up to fifteen" |
170 evolving 5:71c18f70c34f "babar count up to fifteen" |
171 working directory is now at 1836b91c6c1d |
171 working directory is now at 1836b91c6c1d |
172 $ hg resolve -l |
172 $ hg resolve -l |
173 $ hg log -G |
173 $ hg log -G |
174 @ changeset: 6:1836b91c6c1d |
174 @ changeset: 8:1836b91c6c1d |
175 | tag: tip |
175 | tag: tip |
176 | user: test |
176 | user: test |
177 | date: Thu Jan 01 00:00:00 1970 +0000 |
177 | date: Thu Jan 01 00:00:00 1970 +0000 |
178 | summary: babar count up to fifteen |
178 | summary: babar count up to fifteen |
179 | |
179 | |
180 o changeset: 5:e04690b09bc6 |
180 o changeset: 7:e04690b09bc6 |
181 | parent: 0:29ec1554cfaf |
181 | parent: 0:29ec1554cfaf |
182 | user: test |
182 | user: test |
183 | date: Thu Jan 01 00:00:00 1970 +0000 |
183 | date: Thu Jan 01 00:00:00 1970 +0000 |
184 | summary: babar count up to ten |
184 | summary: babar count up to ten |
185 | |
185 | |
194 $ safesed 's/merge=.*/merge=touch/' $HGRCPATH |
194 $ safesed 's/merge=.*/merge=touch/' $HGRCPATH |
195 $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH |
195 $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH |
196 $ hg gdown |
196 $ hg gdown |
197 gdown have been deprecated in favor of previous |
197 gdown have been deprecated in favor of previous |
198 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
198 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
199 [5] babar count up to ten |
199 [7] babar count up to ten |
200 $ safesed 's/ten/zehn/' babar |
200 $ safesed 's/ten/zehn/' babar |
201 $ hg diff |
201 $ hg diff |
202 diff -r e04690b09bc6 babar |
202 diff -r e04690b09bc6 babar |
203 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
203 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
204 +++ b/babar Thu Jan 01 00:00:00 1970 +0000 |
204 +++ b/babar * (glob) |
205 @@ -7,4 +7,4 @@ |
205 @@ -7,4 +7,4 @@ |
206 sept |
206 sept |
207 eight |
207 eight |
208 neuf |
208 neuf |
209 -ten |
209 -ten |
210 +zehn |
210 +zehn |
211 $ hg amend |
211 $ hg amend |
212 1 new orphan changesets |
212 1 new unstable changesets |
213 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH |
213 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH |
214 $ hg evolve --tool touch <<EOF |
214 $ hg evolve --tool touch <<EOF |
215 > n |
215 > n |
216 > EOF |
216 > EOF |
217 move:[6] babar count up to fifteen |
217 move:[8] babar count up to fifteen |
218 atop:[7] babar count up to ten |
218 atop:[10] babar count up to ten |
219 merging babar |
219 merging babar |
220 output file babar appears unchanged |
220 output file babar appears unchanged |
221 was merge successful (yn)? n |
221 was merge successful (yn)? n |
222 merging babar failed! |
222 merging babar failed! |
223 fix conflicts and see `hg help evolve.interrupted` |
223 fix conflicts and see `hg help evolve.interrupted` |
224 [1] |
224 [1] |
225 $ hg resolve -l |
225 $ hg resolve -l |
226 U babar |
226 U babar |
227 $ hg log -G |
227 $ hg log -G |
228 @ changeset: 7:b20d08eea373 |
228 @ changeset: 10:b20d08eea373 |
229 | tag: tip |
229 | tag: tip |
230 | parent: 0:29ec1554cfaf |
230 | parent: 0:29ec1554cfaf |
231 | user: test |
231 | user: test |
232 | date: Thu Jan 01 00:00:00 1970 +0000 |
232 | date: Thu Jan 01 00:00:00 1970 +0000 |
233 | summary: babar count up to ten |
233 | summary: babar count up to ten |
234 | |
234 | |
235 | o changeset: 6:1836b91c6c1d |
235 | o changeset: 8:1836b91c6c1d |
236 | | user: test |
236 | | user: test |
237 | | date: Thu Jan 01 00:00:00 1970 +0000 |
237 | | date: Thu Jan 01 00:00:00 1970 +0000 |
238 | | instability: orphan |
238 | | trouble: unstable |
239 | | summary: babar count up to fifteen |
239 | | summary: babar count up to fifteen |
240 | | |
240 | | |
241 | x changeset: 5:e04690b09bc6 |
241 | x changeset: 7:e04690b09bc6 |
242 |/ parent: 0:29ec1554cfaf |
242 |/ parent: 0:29ec1554cfaf |
243 | user: test |
243 | user: test |
244 | date: Thu Jan 01 00:00:00 1970 +0000 |
244 | date: Thu Jan 01 00:00:00 1970 +0000 |
245 | obsolete: amended using amend as 7:b20d08eea373 |
245 | obsolete: amended as b20d08eea373 |
246 | summary: babar count up to ten |
246 | summary: babar count up to ten |
247 | |
247 | |
248 o changeset: 0:29ec1554cfaf |
248 o changeset: 0:29ec1554cfaf |
249 user: test |
249 user: test |
250 date: Thu Jan 01 00:00:00 1970 +0000 |
250 date: Thu Jan 01 00:00:00 1970 +0000 |