Mercurial > hg
comparison tests/test-update-branches.t @ 45916:fa87536d3d70
errors: raise StateError when there are unresolves merge conflicts
Differential Revision: https://phab.mercurial-scm.org/D9392
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 23 Nov 2020 16:48:13 -0800 |
parents | 8939062597f0 |
children | dc00324e80f4 |
comparison
equal
deleted
inserted
replaced
45915:8f50dc096cf4 | 45916:fa87536d3d70 |
---|---|
346 Try to make empty commit while there are conflicts | 346 Try to make empty commit while there are conflicts |
347 $ hg revert -r . a | 347 $ hg revert -r . a |
348 $ rm a.orig | 348 $ rm a.orig |
349 $ hg ci -m empty | 349 $ hg ci -m empty |
350 abort: unresolved merge conflicts (see 'hg help resolve') | 350 abort: unresolved merge conflicts (see 'hg help resolve') |
351 [255] | 351 [20] |
352 $ hg resolve -m a | 352 $ hg resolve -m a |
353 (no more unresolved files) | 353 (no more unresolved files) |
354 $ hg resolve -l | 354 $ hg resolve -l |
355 R a | 355 R a |
356 $ hg ci -m empty | 356 $ hg ci -m empty |