Mercurial > hg
comparison tests/test-conflict.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 | 96f43981c1c4 |
children | a36d3c8a0e41 |
comparison
equal
deleted
inserted
replaced
35703:9a50ffd15b25 | 35704:41ef02ba329b |
---|---|
36 | 36 |
37 $ hg merge 1 | 37 $ hg merge 1 |
38 merging a | 38 merging a |
39 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 39 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
40 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 40 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
41 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 41 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
42 [1] | 42 [1] |
43 | 43 |
44 $ hg id | 44 $ hg id |
45 618808747361+c0c68e4fe667+ tip | 45 618808747361+c0c68e4fe667+ tip |
46 | 46 |
89 | 89 |
90 $ hg merge 1 | 90 $ hg merge 1 |
91 merging a | 91 merging a |
92 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 92 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
93 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 93 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
94 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 94 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
95 [1] | 95 [1] |
96 | 96 |
97 $ cat a | 97 $ cat a |
98 Small Mathematical Series. | 98 Small Mathematical Series. |
99 1 | 99 1 |
180 | 180 |
181 $ hg merge 1 | 181 $ hg merge 1 |
182 merging a | 182 merging a |
183 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 183 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
184 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 184 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
185 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 185 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
186 [1] | 186 [1] |
187 | 187 |
188 $ cat a | 188 $ cat a |
189 Small Mathematical Series. | 189 Small Mathematical Series. |
190 1 | 190 1 |
205 | 205 |
206 $ hg merge 1 --tool internal:merge3 | 206 $ hg merge 1 --tool internal:merge3 |
207 merging a | 207 merging a |
208 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 208 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
209 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 209 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
210 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 210 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
211 [1] | 211 [1] |
212 $ cat a | 212 $ cat a |
213 Small Mathematical Series. | 213 Small Mathematical Series. |
214 <<<<<<< working copy | 214 <<<<<<< working copy |
215 1 | 215 1 |
252 | 252 |
253 $ hg merge | 253 $ hg merge |
254 merging a | 254 merging a |
255 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 255 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
256 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | 256 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
257 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 257 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
258 [1] | 258 [1] |
259 $ hg resolve --tool :merge-other a | 259 $ hg resolve --tool :merge-other a |
260 merging a | 260 merging a |
261 (no more unresolved files) | 261 (no more unresolved files) |
262 $ cat a | 262 $ cat a |