Mercurial > hg
view tests/test-narrow-update.t @ 38336:bb7e3c6ef592
phabricator: preserve the phase when amending in the Differential fields
I have no idea if it's better to change scmutil.cleanupnodes() so that it has
the option to either apply a specific phase (e.g. for various --secret switches)
or carry over the phase of the old node. The benefit would be that the caller
doesn't have to remember to do this. The con is maybe inefficiency? I wrote
this up as issue5918. I'm leaving that open since Yuya flagged it as an API
bug.
Since most other callers already do this, it's the simplest fix. (It's not
obvious that `split`, `fix` and `rebase` are doing this, but there is test
coverage for `fix` and `rebase`, and experimenting with `split` shows it does
the right thing.)
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 14 Jun 2018 12:35:04 -0400 |
parents | d4e62df1c73d |
children | 351cbda889db |
line wrap: on
line source
$ . "$TESTDIR/narrow-library.sh" create full repo $ hg init master $ cd master $ echo init > init $ hg ci -Aqm 'initial' $ mkdir inside $ echo inside > inside/f1 $ mkdir outside $ echo outside > outside/f1 $ hg ci -Aqm 'add inside and outside' $ echo modified > inside/f1 $ hg ci -qm 'modify inside' $ echo modified > outside/f1 $ hg ci -qm 'modify outside' $ cd .. $ hg clone --narrow ssh://user@dummy/master narrow --include inside requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 2 changes to 1 files new changesets *:* (glob) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd narrow $ hg debugindex -c rev linkrev nodeid p1 p2 0 0 9958b1af2add 000000000000 000000000000 1 1 2db4ce2a3bfe 9958b1af2add 000000000000 2 2 0980ee31a742 2db4ce2a3bfe 000000000000 3 3 4410145019b7 0980ee31a742 000000000000 $ hg update -q 0 Can update to revision with changes inside $ hg update -q 'desc("add inside and outside")' $ hg update -q 'desc("modify inside")' $ find * inside inside/f1 $ cat inside/f1 modified Can update to revision with changes outside $ hg update -q 'desc("modify outside")' $ find * inside inside/f1 $ cat inside/f1 modified Can update with a deleted file inside $ hg rm inside/f1 $ hg update -q 'desc("modify inside")' $ hg update -q 'desc("modify outside")' $ hg update -q 'desc("initial")' $ hg update -q 'desc("modify inside")' Can update with a moved file inside $ hg mv inside/f1 inside/f2 $ hg update -q 'desc("modify outside")' $ hg update -q 'desc("initial")' $ hg update -q 'desc("modify inside")'