( )⚙ D5998 tests: change the paths slightly in test-rebase-inmemory.t

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5998

tests: change the paths slightly in test-rebase-inmemory.t
ClosedPublic

Authored by spectral on Feb 21 2019, 10:16 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG0b2361c2c493: tests: change the paths slightly in test-rebase-inmemory.t
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-inmemory.t (14 lines)

Diff 14188

tests/test-rebase-inmemory.t

| o 3: 844a7de3e617 'c' | o 3: 844a7de3e617 'c'
| | | |
o | 2: 09c044d2cb43 'd' o | 2: 09c044d2cb43 'd'
| | | |
o | 1: fc055c3b4d33 'b' o | 1: fc055c3b4d33 'b'
|/ |/
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ mkdir c $ mkdir -p c/subdir
$ echo c > c/c $ echo c > c/subdir/file.txt
$ hg add c/c $ hg add c/subdir/file.txt
$ hg ci -m 'c/c' $ hg ci -m 'c/subdir/file.txt'
$ hg rebase -r . -d 3 -n $ hg rebase -r . -d 3 -n
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing 8:755f0104af9b "c/c" (tip) rebasing 8:e147e6e3c490 "c/subdir/file.txt" (tip)
abort: error: 'c/c' conflicts with file 'c' in 3. abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3.
[255] [255]
$ hg rebase -r 3 -d . -n $ hg rebase -r 3 -d . -n
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing 3:844a7de3e617 "c" rebasing 3:844a7de3e617 "c"
abort: error: file 'c' cannot be written because 'c/' is a folder in 755f0104af9b (containing 1 entries: c/c) abort: error: file 'c' cannot be written because 'c/' is a folder in e147e6e3c490 (containing 1 entries: c/subdir/file.txt)
[255] [255]
$ cd .. $ cd ..
Test path auditing (issue5818) Test path auditing (issue5818)
$ mkdir lib_ $ mkdir lib_
$ ln -s lib_ lib $ ln -s lib_ lib