Mercurial > evolve

comparison tests/test-evolve.t @ 1762:ad04f3c3b1a9 mercurial-3.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with latest fix
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sat, 29 Oct 2016 15:04:23 +0200
parents 1dbb8fdb725a e2585c6cdbdc
children 6d54fd20bb81 b1809340478b
comparison
equal deleted inserted replaced
1750:1dbb8fdb725a 1762:ad04f3c3b1a9
113 113
114 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' 114 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
115 1 public 115 1 public
116 $ hg prune 1 116 $ hg prune 1
117 abort: cannot prune immutable changeset: 7c3bad9141dc 117 abort: cannot prune immutable changeset: 7c3bad9141dc
118 (see "hg help phases" for details) 118 (see 'hg help phases' for details)
119 [255] 119 [255]
120 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' 120 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
121 1 public 121 1 public
122 122
123 test simple kill 123 test simple kill
1245 [255] 1245 [255]
1246 $ hg up 8dc373be86d9 1246 $ hg up 8dc373be86d9
1247 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1247 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1248 $ hg uncommit --all 1248 $ hg uncommit --all
1249 new changeset is empty 1249 new changeset is empty
1250 (use "hg prune ." to remove it) 1250 (use 'hg prune .' to remove it)
1251 $ glog -r "18::" 1251 $ glog -r "18::"
1252 @ 26:044804d0c10d@default(draft) add j1 1252 @ 26:044804d0c10d@default(draft) add j1
1253 | 1253 |
1254 | o 23:d7eadcf6eccd@default(draft) add j3 1254 | o 23:d7eadcf6eccd@default(draft) add j3
1255 | | 1255 | |
1427 atop:[42] will be evolved safely 1427 atop:[42] will be evolved safely
1428 merging newfile 1428 merging newfile
1429 warning: conflicts during merge. 1429 warning: conflicts during merge.
1430 merging newfile incomplete! (edit conflicts, then use 'hg resolve --mark') 1430 merging newfile incomplete! (edit conflicts, then use 'hg resolve --mark')
1431 evolve failed! 1431 evolve failed!
1432 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort 1432 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
1433 abort: unresolved merge conflicts (see hg help resolve) 1433 abort: unresolved merge conflicts (see hg help resolve)
1434 [255] 1434 [255]
1435 1435
1436 $ glog -r "36::" --hidden 1436 $ glog -r "36::" --hidden
1437 @ 42:c904da5245b0@default(draft) will be evolved safely 1437 @ 42:c904da5245b0@default(draft) will be evolved safely