8 $ hg init repo |
8 $ hg init repo |
9 $ cd repo |
9 $ cd repo |
10 |
10 |
11 Create base changeset |
11 Create base changeset |
12 |
12 |
13 $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 1 |
13 $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 1 |
14 $ hg addremove -q --similarity 0 |
14 $ hg addremove -q --similarity 0 |
15 $ hg commit -qm 'base' |
15 $ hg commit -qm 'base' |
16 |
16 |
17 Create remote changeset |
17 Create remote changeset |
18 |
18 |
19 $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 2 |
19 $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 2 |
20 $ hg addremove -q --similarity 0 |
20 $ hg addremove -q --similarity 0 |
21 $ hg commit -qm 'remote' |
21 $ hg commit -qm 'remote' |
22 |
22 |
23 Create local changeset |
23 Create local changeset |
24 |
24 |
25 $ hg update -q 0 |
25 $ hg update -q 0 |
26 $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 3 |
26 $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 3 |
27 $ hg addremove -q --similarity 0 |
27 $ hg addremove -q --similarity 0 |
28 $ hg commit -qm 'local' |
28 $ hg commit -qm 'local' |
29 |
29 |
30 Set up working directory |
30 Set up working directory |
31 |
31 |
32 $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 wc |
32 $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 wc |
33 $ hg addremove -q --similarity 0 |
33 $ hg addremove -q --similarity 0 |
34 $ hg forget *_*_*_*-untracked |
34 $ hg forget *_*_*_*-untracked |
35 $ rm *_*_*_missing-* |
35 $ rm *_*_*_missing-* |
36 |
36 |
37 $ hg status -A |
37 $ hg status -A |
832 |
832 |
833 Set up working directory again |
833 Set up working directory again |
834 |
834 |
835 $ hg -q update --clean 2 |
835 $ hg -q update --clean 2 |
836 $ hg --config extensions.purge= purge |
836 $ hg --config extensions.purge= purge |
837 $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 wc |
837 $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 wc |
838 $ hg addremove -q --similarity 0 |
838 $ hg addremove -q --similarity 0 |
839 $ hg forget *_*_*_*-untracked |
839 $ hg forget *_*_*_*-untracked |
840 $ rm *_*_*_missing-* |
840 $ rm *_*_*_missing-* |
841 |
841 |
842 Merge with checkunknown = warn, see that behavior is the same as before |
842 Merge with checkunknown = warn, see that behavior is the same as before |