Mercurial > hg
view tests/test-narrow-debugrebuilddirstate.t @ 38952:0e58c5b20745
mergetool: warn if ui.merge points to nonexistent tool
This adds a warning when ui.merge is configured but points to an
executable that doesn't exist. It gets printed once per fail, but that
seems to be how our other warnings about merge tools are reported.
Differential Revision: https://phab.mercurial-scm.org/D3975
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 23 Jul 2018 22:51:53 -0700 |
parents | a2a6e724d61a |
children | 01c0f01b562b |
line wrap: on
line source
$ . "$TESTDIR/narrow-library.sh" $ hg init master $ cd master $ echo treemanifest >> .hg/requires $ echo 'contents of file' > file $ mkdir foo $ echo 'contents of foo/bar' > foo/bar $ hg ci -Am 'some change' adding file adding foo/bar $ cd .. $ hg clone --narrow ssh://user@dummy/master copy --include=foo requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files new changesets * (glob) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd copy $ hg debugdirstate n * 20 unset foo/bar (glob) $ mv .hg/dirstate .hg/old_dirstate $ dd bs=40 count=1 if=.hg/old_dirstate of=.hg/dirstate 2>/dev/null $ hg debugdirstate $ hg debugrebuilddirstate $ hg debugdirstate n * * unset foo/bar (glob)