Mercurial > evolve

comparison tests/test-stabilize-result.t @ 1756:a7dcfff8c4a9 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: use single quotes in usage messages Mercurial core has moved in this direction, so let's follow.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 28 Oct 2016 17:15:57 -0700
parents 6c78a5470583
children 5526e97928d7 9f42f819267b
comparison
equal deleted inserted replaced
1755:6c78a5470583 1756:a7dcfff8c4a9
82 move:[5] newer a 82 move:[5] newer a
83 atop:[7] changea 83 atop:[7] changea
84 merging a 84 merging a
85 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 85 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
86 evolve failed! 86 evolve failed!
87 fix conflict and run "hg evolve --continue" or use "hg update -C ." to abort 87 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
88 abort: unresolved merge conflicts (see hg help resolve) 88 abort: unresolved merge conflicts (see hg help resolve)
89 [255] 89 [255]
90 $ hg revert -r 'unstable()' a 90 $ hg revert -r 'unstable()' a
91 $ hg diff 91 $ hg diff
92 diff -r 66719795a494 a 92 diff -r 66719795a494 a
221 $ echo 'babar' >> a 221 $ echo 'babar' >> a
222 $ hg amend 222 $ hg amend
223 $ hg up --hidden 15 223 $ hg up --hidden 15
224 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 224 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
225 working directory parent is obsolete! 225 working directory parent is obsolete!
226 (use "hg evolve" to update to its successor) 226 (use 'hg evolve' to update to its successor)
227 $ mv a a.old 227 $ mv a a.old
228 $ echo 'jungle' > a 228 $ echo 'jungle' > a
229 $ cat a.old >> a 229 $ cat a.old >> a
230 $ rm a.old 230 $ rm a.old
231 $ hg amend 231 $ hg amend
334 ------------------------------------------------- 334 -------------------------------------------------
335 335
336 $ hg up --hidden 15 336 $ hg up --hidden 15
337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
338 working directory parent is obsolete! 338 working directory parent is obsolete!
339 (use "hg evolve" to update to its successor) 339 (use 'hg evolve' to update to its successor)
340 $ echo 'gotta break' >> a 340 $ echo 'gotta break' >> a
341 $ hg amend 341 $ hg amend
342 2 new divergent changesets 342 2 new divergent changesets
343 # reamend so that the case is not the first precursor. 343 # reamend so that the case is not the first precursor.
344 $ hg amend -m "More addition (2)" 344 $ hg amend -m "More addition (2)"