Mercurial > hg > mercurial-source
view tests/test-narrow-debugrebuilddirstate.t @ 38706:ea63a2004d09
update: print warning about hidden changeset after update
When an attempt to update to a hidden changeset fails because the
working copy is dirty, you may get a message like this:
updating to a hidden changeset 343f6de32686
(hidden revision '343f6de32686' was rewritten as: 4ab941244072)
abort: conflicting changes
(commit or update --clean to discard changes)
It's easy to miss the real error here. This patch moves the warning
about the hidden changeset to after the update has happened. It
changes the verb tense accordingly (and drops the "a" that I think it
sounds better without). Of course, this means that the commit isn't
actually hidden anymore when the message is printed. I think that's
fine.
Differential Revision: https://phab.mercurial-scm.org/D3479
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 07 May 2018 19:43:43 -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)