[Bug 6067] New: zsh tab completions for `hg resolve -m` don't work in a subdir
mercurial-bugs at mercurial-scm.org
mercurial-bugs at mercurial-scm.org
Wed Jan 30 20:49:19 UTC 2019
https://bz.mercurial-scm.org/show_bug.cgi?id=6067
Bug ID: 6067
Summary: zsh tab completions for `hg resolve -m` don't work in
a subdir
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: Mercurial
Assignee: bugzilla at mercurial-scm.org
Reporter: hg at pewpew.net
CC: mercurial-devel at mercurial-scm.org
$ hg init test_resolve
$ cd test_resolve
$ mkdir -p a/b/c
$ echo hi > a/b/c/foo
$ hg ci -qAm initial
$ echo r1 >> a/b/c/foo
$ hg ci -qm r1
$ hg co .^
$ echo r2 >> a/b/c/foo
$ hg ci -qm r2
$ hg merge --tool internal:merge3
merging a/b/c/foo
warning: conflicts while merging a/b/c/foo! (edit, then use 'hg resolve
--mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to
abandon
$ hg resolve --list
U a/b/c/foo
`hg resolve -m a/<tab>` completes to 'a/b' like it should
However, if I do `cd a`, and then `hg resolve -m b/<tab>`, nothing.
Internally, we call `hg resolve -l ./b` in that situation, get back the path
'a/b/c/foo' (the paths in `hg resolve --list` are NOT relative; though I think
martinvonz is going to make a config option for that, it won't matter here: we
can't rely on it and we're setting HGPLAIN which will disable it), and add that
to the list of unresolved_files.
Something later that I haven't figured out what is for some reason ignoring
that entry in unresolved_files, I guess because it doesn't start with 'b' like
$PREFIX does?
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list