Mercurial > hg > mercurial-source
view tests/test-sparse-clone.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 (2018-05-08) |
parents | c18ae7a07019 |
children | 5abc47d4ca6b |
line wrap: on
line source
test sparse $ cat >> $HGRCPATH << EOF > [ui] > ssh = $PYTHON "$RUNTESTDIR/dummyssh" > username = nobody <no.reply@fb.com> > [extensions] > sparse= > purge= > strip= > rebase= > EOF $ hg init myrepo $ cd myrepo $ echo a > index.html $ echo x > data.py $ echo z > readme.txt $ cat > webpage.sparse <<EOF > [include] > *.html > EOF $ cat > backend.sparse <<EOF > [include] > *.py > EOF $ hg ci -Aqm 'initial' $ cd .. Verify local clone with a sparse profile works $ hg clone --enable-profile webpage.sparse myrepo clone1 updating to branch default warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd clone1 $ ls index.html $ cd .. Verify local clone with include works $ hg clone --include *.sparse myrepo clone2 updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd clone2 $ ls backend.sparse webpage.sparse $ cd .. Verify local clone with exclude works $ hg clone --exclude data.py myrepo clone3 updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd clone3 $ ls backend.sparse index.html readme.txt webpage.sparse $ cd .. Verify sparse clone profile over ssh works $ hg clone -q --enable-profile webpage.sparse ssh://user@dummy/myrepo clone4 warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it $ cd clone4 $ ls index.html $ cd ..