Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 41765:0b2361c2c493
tests: change the paths slightly in test-rebase-inmemory.t
c/c was a little difficult to understand (and verify that it was the *correct*
'c/' that was being talked about), and it's useful to have multiple directories
to prove that we are able to detect this even if there's no files (just a
subdirectory) in the immediate directory that's conflicting.
Differential Revision: https://phab.mercurial-scm.org/D5998
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Thu, 21 Feb 2019 19:11:28 -0800 |
parents | 23dc23897248 |
children | dd1ab72be983 |
comparison
equal
deleted
inserted
replaced
41764:37ead13fb3d4 | 41765:0b2361c2c493 |
---|---|
238 | | | 238 | | |
239 o | 1: fc055c3b4d33 'b' | 239 o | 1: fc055c3b4d33 'b' |
240 |/ | 240 |/ |
241 o 0: b173517d0057 'a' | 241 o 0: b173517d0057 'a' |
242 | 242 |
243 $ mkdir c | 243 $ mkdir -p c/subdir |
244 $ echo c > c/c | 244 $ echo c > c/subdir/file.txt |
245 $ hg add c/c | 245 $ hg add c/subdir/file.txt |
246 $ hg ci -m 'c/c' | 246 $ hg ci -m 'c/subdir/file.txt' |
247 $ hg rebase -r . -d 3 -n | 247 $ hg rebase -r . -d 3 -n |
248 starting dry-run rebase; repository will not be changed | 248 starting dry-run rebase; repository will not be changed |
249 rebasing 8:755f0104af9b "c/c" (tip) | 249 rebasing 8:e147e6e3c490 "c/subdir/file.txt" (tip) |
250 abort: error: 'c/c' conflicts with file 'c' in 3. | 250 abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3. |
251 [255] | 251 [255] |
252 $ hg rebase -r 3 -d . -n | 252 $ hg rebase -r 3 -d . -n |
253 starting dry-run rebase; repository will not be changed | 253 starting dry-run rebase; repository will not be changed |
254 rebasing 3:844a7de3e617 "c" | 254 rebasing 3:844a7de3e617 "c" |
255 abort: error: file 'c' cannot be written because 'c/' is a folder in 755f0104af9b (containing 1 entries: c/c) | 255 abort: error: file 'c' cannot be written because 'c/' is a folder in e147e6e3c490 (containing 1 entries: c/subdir/file.txt) |
256 [255] | 256 [255] |
257 | 257 |
258 $ cd .. | 258 $ cd .. |
259 | 259 |
260 Test path auditing (issue5818) | 260 Test path auditing (issue5818) |