##// END OF EJS Templates
rebase: fix path auditing to audit path relative to repo root (issue5818)...
Martin von Zweigbergk -
r40852:1c8c54cf 4.8.1 stable
parent child Browse files
Show More
@@ -1848,8 +1848,8 b' class overlayworkingctx(committablectx):'
1848 fail(path, component)
1848 fail(path, component)
1849
1849
1850 # Test the other direction -- that this path from p2 isn't a directory
1850 # Test the other direction -- that this path from p2 isn't a directory
1851 # in p1 (test that p1 doesn't any paths matching `path/*`).
1851 # in p1 (test that p1 doesn't have any paths matching `path/*`).
1852 match = matchmod.match('/', '', [path + '/'], default=b'relpath')
1852 match = self.match(pats=[path + '/'], default=b'path')
1853 matches = self.p1().manifest().matches(match)
1853 matches = self.p1().manifest().matches(match)
1854 mfiles = matches.keys()
1854 mfiles = matches.keys()
1855 if len(mfiles) > 0:
1855 if len(mfiles) > 0:
@@ -279,8 +279,7 b' Test path auditing (issue5818)'
279 created new head
279 created new head
280 $ hg rebase -s 1 -d .
280 $ hg rebase -s 1 -d .
281 rebasing 1:* "b" (glob)
281 rebasing 1:* "b" (glob)
282 abort: path '*/lib/b' traverses symbolic link '*/lib' (glob)
282 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-rebase.hg (glob)
283 [255]
284 $ cd ..
283 $ cd ..
285
284
286 Test dry-run rebasing
285 Test dry-run rebasing
General Comments 0
You need to be logged in to leave comments. Login now