Mercurial > hg
comparison tests/test-rename-dir-merge.t @ 46418:dc00324e80f4
errors: use StateError more in merge module
Differential Revision: https://phab.mercurial-scm.org/D9912
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 29 Jan 2021 15:56:08 -0800 |
parents | 17e12938f8e7 |
children | ad30b29bc23d |
comparison
equal
deleted
inserted
replaced
46417:768056549737 | 46418:dc00324e80f4 |
---|---|
108 $ hg co -qC 1 | 108 $ hg co -qC 1 |
109 $ echo target > b/c | 109 $ echo target > b/c |
110 $ hg merge 2 | 110 $ hg merge 2 |
111 b/c: untracked file differs | 111 b/c: untracked file differs |
112 abort: untracked files in working directory differ from files in requested revision | 112 abort: untracked files in working directory differ from files in requested revision |
113 [255] | 113 [20] |
114 $ cat b/c | 114 $ cat b/c |
115 target | 115 target |
116 but it should succeed if the content matches | 116 but it should succeed if the content matches |
117 $ hg cat -r 2 a/c > b/c | 117 $ hg cat -r 2 a/c > b/c |
118 $ hg merge 2 | 118 $ hg merge 2 |