Mercurial > evolve

comparison tests/test-stabilize-result.t @ 1700:05d7df73a56b mercurial-3.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable through 3.5 branch
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 06 May 2016 00:08:31 +0200
parents e359d33856c3 dd6f090b7342
children bc590681de77
comparison
equal deleted inserted replaced
1699:9b1bec442496 1700:05d7df73a56b
365 (/!\ You can try: 365 (/!\ You can try:
366 /!\ * manual merge + resolve => new cset X 366 /!\ * manual merge + resolve => new cset X
367 /!\ * hg up to the parent of the amended changeset (which are named W and Z) 367 /!\ * hg up to the parent of the amended changeset (which are named W and Z)
368 /!\ * hg revert --all -r X 368 /!\ * hg revert --all -r X
369 /!\ * hg ci -m "same message as the amended changeset" => new cset Y 369 /!\ * hg ci -m "same message as the amended changeset" => new cset Y
370 /!\ * hg kill -n Y W Z 370 /!\ * hg prune -n Y W Z
371 ) 371 )
372 [255] 372 [255]