diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -1848,8 +1848,8 @@ fail(path, component) # Test the other direction -- that this path from p2 isn't a directory - # in p1 (test that p1 doesn't any paths matching `path/*`). - match = matchmod.match('/', '', [path + '/'], default=b'relpath') + # in p1 (test that p1 doesn't have any paths matching `path/*`). + match = self.match(pats=[path + '/'], default=b'path') matches = self.p1().manifest().matches(match) mfiles = matches.keys() if len(mfiles) > 0: diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t --- a/tests/test-rebase-inmemory.t +++ b/tests/test-rebase-inmemory.t @@ -279,8 +279,7 @@ created new head $ hg rebase -s 1 -d . rebasing 1:* "b" (glob) - abort: path '*/lib/b' traverses symbolic link '*/lib' (glob) - [255] + saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-rebase.hg (glob) $ cd .. Test dry-run rebasing