Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 39131:02e80e37fbbc
tests: demonstrate that IMM needs to be smarter with path conflicts
When we try to rebase a commit which deletes an existing file and make a
directory of the same name, rebase with IMM aborts. It should work fine just
like the without IMM case.
Differential Revision: https://phab.mercurial-scm.org/D4299
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Thu, 16 Aug 2018 16:53:48 +0300 |
parents | 0600d09764df |
children | 873f3a56993f |
comparison
equal
deleted
inserted
replaced
39130:0600d09764df | 39131:02e80e37fbbc |
---|---|
153 | o 2: 09c044d2cb43 'd' | 153 | o 2: 09c044d2cb43 'd' |
154 | | | 154 | | |
155 | o 1: fc055c3b4d33 'b' | 155 | o 1: fc055c3b4d33 'b' |
156 |/ | 156 |/ |
157 o 0: b173517d0057 'a' | 157 o 0: b173517d0057 'a' |
158 | |
159 | |
160 Test reporting of path conflicts | |
161 | |
162 $ hg rm a | |
163 $ mkdir a | |
164 $ touch a/a | |
165 $ hg ci -Am "a/a" | |
166 adding a/a | |
167 $ hg tglog | |
168 @ 4: daf7dfc139cb 'a/a' | |
169 | | |
170 o 3: 844a7de3e617 'c' | |
171 | | |
172 | o 2: 09c044d2cb43 'd' | |
173 | | | |
174 | o 1: fc055c3b4d33 'b' | |
175 |/ | |
176 o 0: b173517d0057 'a' | |
177 | |
178 $ hg rebase -r . -d 2 | |
179 rebasing 4:daf7dfc139cb "a/a" (tip) | |
180 abort: error: 'a/a' conflicts with file 'a' in 2. | |
181 [255] | |
158 | 182 |
159 $ cd .. | 183 $ cd .. |
160 | 184 |
161 Test dry-run rebasing | 185 Test dry-run rebasing |
162 | 186 |