Mercurial > evolve

comparison tests/test-stabilize-result.t @ 586:f01721161532 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: rename conflicting into divergent
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Tue, 23 Oct 2012 15:44:24 +0200
parents 415540dee2bd
children 8152fedbac65
comparison
equal deleted inserted replaced
585:f013ca072bd9 586:f01721161532
208 $ mv a a.old 208 $ mv a a.old
209 $ echo 'jungle' > a 209 $ echo 'jungle' > a
210 $ cat a.old >> a 210 $ cat a.old >> a
211 $ rm a.old 211 $ rm a.old
212 $ hg amend 212 $ hg amend
213 2 new conflicting changesets 213 2 new divergent changesets
214 $ glog 214 $ glog
215 @ 19:3883461cc228@default(draft) bk:[] More addition 215 @ 19:3883461cc228@default(draft) bk:[] More addition
216 | 216 |
217 | o 17:4754d61bc2db@default(draft) bk:[] More addition 217 | o 17:4754d61bc2db@default(draft) bk:[] More addition
218 |/ 218 |/
238 hg commit -m "`hg log -r 3883461cc228 --template={desc}`"; 238 hg commit -m "`hg log -r 3883461cc228 --template={desc}`";
239 $ hg evolve -v 239 $ hg evolve -v
240 merge:[19] More addition 240 merge:[19] More addition
241 with: [17] More addition 241 with: [17] More addition
242 base: [15] More addition 242 base: [15] More addition
243 merging conflicting changeset 243 merging divergent changeset
244 resolving manifests 244 resolving manifests
245 merging a 245 merging a
246 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 246 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
247 a 247 a
248 a 248 a
295 $ hg up 15 295 $ hg up 15
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
297 Working directory parent is obsolete 297 Working directory parent is obsolete
298 $ echo 'gotta break' >> a 298 $ echo 'gotta break' >> a
299 $ hg amend 299 $ hg amend
300 1 new conflicting changesets 300 1 new divergent changesets
301 $ hg evolve -qn 301 $ hg evolve -qn
302 hg update -c c956a4b140b6 && 302 hg update -c c956a4b140b6 &&
303 hg merge ac6d600735a4 && 303 hg merge ac6d600735a4 &&
304 hg commit -m "auto merge resolving conflict between c956a4b140b6 and ac6d600735a4"&& 304 hg commit -m "auto merge resolving conflict between c956a4b140b6 and ac6d600735a4"&&
305 hg up -C 7391601a4bfa && 305 hg up -C 7391601a4bfa &&