Mercurial > hg
comparison tests/test-convert-svn-sink.t @ 35704:41ef02ba329b
merge: add `--abort` flag which can abort the merge
Currently we don't have a good functionality to abort the merge and tell user to
do `hg update -C .` which can leads to different results if user missed the '.'
and moreover does not align with other abort functionalities like rebase, shelve
etc.
This patch adds `hg merge --abort` which will abort the ongoing merge and take
us back to the chagneset where we started from. Works in both cases when merge
resulted in conflicts and when there were no conflicts.
.. feature::
A `--abort` flag to merge command to abort the ongoing merge.
Differential Revision: https://phab.mercurial-scm.org/D1829
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 08 Jan 2018 19:41:47 +0530 |
parents | 4441705b7111 |
children | 5abc47d4ca6b |
comparison
equal
deleted
inserted
replaced
35703:9a50ffd15b25 | 35704:41ef02ba329b |
---|---|
382 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | 382 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
383 $ hg --cwd b merge | 383 $ hg --cwd b merge |
384 merging b | 384 merging b |
385 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 385 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
386 2 files updated, 0 files merged, 0 files removed, 1 files unresolved | 386 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
387 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 387 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
388 [1] | 388 [1] |
389 $ hg --cwd b revert -r 2 b | 389 $ hg --cwd b revert -r 2 b |
390 $ hg --cwd b resolve -m b | 390 $ hg --cwd b resolve -m b |
391 (no more unresolved files) | 391 (no more unresolved files) |
392 $ hg --cwd b ci -d '5 0' -m 'merge' | 392 $ hg --cwd b ci -d '5 0' -m 'merge' |