Mercurial > hg
comparison tests/test-update-branches.t @ 48406:51f521900473
update: add a test for `--merge` overriding the "abort" config
I don't see this behavior tested anywhere.
Differential Revision: https://phab.mercurial-scm.org/D11850
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 03 Dec 2021 12:19:36 +0100 |
parents | acdd4a42deaa |
children | 4d59e0f909e0 |
comparison
equal
deleted
inserted
replaced
48405:acdd4a42deaa | 48406:51f521900473 |
---|---|
217 M foo | 217 M foo |
218 | 218 |
219 $ revtest '--merge none dirty linear' dirty 1 2 --check | 219 $ revtest '--merge none dirty linear' dirty 1 2 --check |
220 abort: uncommitted changes | 220 abort: uncommitted changes |
221 parent=1 | 221 parent=1 |
222 M foo | |
223 | |
224 $ revtest '--merge none dirty linear' dirty 1 2 --merge | |
225 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
226 parent=2 | |
222 M foo | 227 M foo |
223 | 228 |
224 $ revtest 'none dirty linear' dirty 1 2 --clean | 229 $ revtest 'none dirty linear' dirty 1 2 --clean |
225 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 230 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
226 parent=2 | 231 parent=2 |