equal
deleted
inserted
replaced
250 abort: error: 'c/subdir/file.txt' 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 e147e6e3c490 (containing 1 entries: c/subdir/file.txt) |
255 abort: error: file 'c' cannot be written because 'c/' is a directory 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) |