Show More
@@ -240,19 +240,19 b' Test reporting of path conflicts' | |||||
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/ |
|
244 | $ echo c > c/subdir/file.txt | |
245 |
$ hg add c/ |
|
245 | $ hg add c/subdir/file.txt | |
246 |
$ hg ci -m '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/ |
|
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 |
|
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 .. |
General Comments 0
You need to be logged in to leave comments.
Login now