Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 39575:aa022f8873ea
rebase: add tests showing patch conflict detection needs to be smarter in IMM
This patch adds test which shows that you can't rebase a cset which removes a
dir and adds a file of the same as that of dir as there are False positives
path conflicts reported.
I fixed the case when there is a file and we adds a dir of same name while
removing the file, but missed testing the current case. Next patch will fix
this.
Differential Revision: https://phab.mercurial-scm.org/D4544
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Wed, 12 Sep 2018 17:22:46 +0300 |
parents | 485a3349d5ee |
children | fa4d16daf1be |
comparison
equal
deleted
inserted
replaced
39574:a2d17b699628 | 39575:aa022f8873ea |
---|---|
176 o 0: b173517d0057 'a' | 176 o 0: b173517d0057 'a' |
177 | 177 |
178 $ hg rebase -r . -d 2 | 178 $ hg rebase -r . -d 2 |
179 rebasing 4:daf7dfc139cb "a/a" (tip) | 179 rebasing 4:daf7dfc139cb "a/a" (tip) |
180 saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg | 180 saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg |
181 | |
182 $ hg tglog | |
183 @ 4: c6ad37a4f250 'a/a' | |
184 | | |
185 | o 3: 844a7de3e617 'c' | |
186 | | | |
187 o | 2: 09c044d2cb43 'd' | |
188 | | | |
189 o | 1: fc055c3b4d33 'b' | |
190 |/ | |
191 o 0: b173517d0057 'a' | |
192 | |
193 $ echo foo > foo | |
194 $ hg ci -Aqm "added foo" | |
195 $ hg up '.^' | |
196 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
197 $ echo bar > bar | |
198 $ hg ci -Aqm "added bar" | |
199 $ hg rm a/a | |
200 $ echo a > a | |
201 $ hg ci -Aqm "added a back!" | |
202 $ hg tglog | |
203 @ 7: 855e9797387e 'added a back!' | |
204 | | |
205 o 6: d14530e5e3e6 'added bar' | |
206 | | |
207 | o 5: 9b94b9373deb 'added foo' | |
208 |/ | |
209 o 4: c6ad37a4f250 'a/a' | |
210 | | |
211 | o 3: 844a7de3e617 'c' | |
212 | | | |
213 o | 2: 09c044d2cb43 'd' | |
214 | | | |
215 o | 1: fc055c3b4d33 'b' | |
216 |/ | |
217 o 0: b173517d0057 'a' | |
218 | |
219 $ hg rebase -r . -d 5 | |
220 rebasing 7:855e9797387e "added a back!" (tip) | |
221 abort: error: file 'a' cannot be written because 'a/' is a folder in 9b94b9373deb (containing 1 entries: a/a) | |
222 [255] | |
181 | 223 |
182 $ cd .. | 224 $ cd .. |
183 | 225 |
184 Test dry-run rebasing | 226 Test dry-run rebasing |
185 | 227 |