Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 42100:b63b8b7ca5fa
messages: replace some instances of "folder" by "directory"
I'm pretty sure this is our preferred term.
Differential Revision: https://phab.mercurial-scm.org/D6222
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 10 Apr 2019 16:26:40 -0700 |
| parents | e1ceefab9bca |
| children | 818051048c2e |
comparison
equal
deleted
inserted
replaced
| 42099:bccb322f1496 | 42100:b63b8b7ca5fa |
|---|---|
| 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) |