Mercurial > hg
annotate tests/test-strip-cross.t @ 28022:e397b58c0563
rebase: respect checkunknown and checkignored in more cases
checkunknown and checkignored are currently respected for updates and regular
merges, but not for certain kinds of rebases. To be precise, they aren't
respected for rebases when:
(1) we're rebasing while currently on the destination commit, and
(2) an untracked or ignored file F is currently in the working copy, and
(3) the same file F is in a source commit, and
(4) F has different contents in the source commit.
This happens because rebases set force to True when calling merge.update.
Setting force to True makes a lot of sense in general, but it turns out the
force option is overloaded: there's a deprecated '--force' option in merge that
allows you to merge in outstanding changes, including changes in untracked
files. We use the 'mergeforce' parameter to tell those two cases apart.
I think the behavior during rebases when checkunknown is 'abort' (the default)
is wrong -- we should abort on or overwrite differing untracked files, not try
to merge them in. However that currently breaks rebases by aborting in the
middle -- we need better handling for that case before we can change the
default.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 03 Feb 2016 13:12:06 -0800 |
parents | aa9385f983fa |
children | 009d0283de5f |
rev | line source |
---|---|
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
1 test stripping of filelogs where the linkrev doesn't always increase |
5909
f45f7390c1c5
strip: calculate list of extra nodes to save and pass it to changegroupsubset
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
3 $ echo '[extensions]' >> $HGRCPATH |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20115
diff
changeset
|
4 $ echo 'strip =' >> $HGRCPATH |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
5 $ hg init orig |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
6 $ cd orig |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
7 $ commit() |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
8 > { |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
9 > hg up -qC null |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
10 > count=1 |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
11 > for i in "$@"; do |
12537
5df8ef0f3f51
tests: fix tabs/indentation in test-strip-cross.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
12492
diff
changeset
|
12 > for f in $i; do |
5df8ef0f3f51
tests: fix tabs/indentation in test-strip-cross.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
12492
diff
changeset
|
13 > echo $count > $f |
5df8ef0f3f51
tests: fix tabs/indentation in test-strip-cross.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
12492
diff
changeset
|
14 > done |
5df8ef0f3f51
tests: fix tabs/indentation in test-strip-cross.t
Adrian Buehlmann <adrian@cadifra.com>
parents:
12492
diff
changeset
|
15 > count=`expr $count + 1` |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
16 > done |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
17 > hg commit -qAm "$*" |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
18 > } |
5909
f45f7390c1c5
strip: calculate list of extra nodes to save and pass it to changegroupsubset
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
19 |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
20 2 1 0 2 0 1 2 |
5909
f45f7390c1c5
strip: calculate list of extra nodes to save and pass it to changegroupsubset
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
21 |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
22 $ commit '201 210' |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
23 $ commit '102 120' '210' |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
24 $ commit '021' |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
25 $ commit '201' '021 120' |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
26 $ commit '012 021' '102 201' '120 210' |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
27 $ commit 'manifest-file' |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
28 $ commit '102 120' '012 210' '021 201' |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
29 $ commit '201 210' '021 120' '012 102' |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
30 $ HGUSER=another-user; export HGUSER |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
31 $ commit 'manifest-file' |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
32 $ commit '012' 'manifest-file' |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
33 $ cd .. |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
34 $ hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
35 $ cd crossed |
14323
a79fea6b3e77
debugindex etc.: add --changelog and --manifest options
Sune Foldager <cryo@cyanite.org>
parents:
14182
diff
changeset
|
36 $ hg debugindex --manifest |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
37 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
38 0 0 112 ..... 0 6f105cbb914d 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
39 1 112 56 ..... 3 1b55917b3699 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
40 2 168 123 ..... 1 8f3d04e263e5 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
41 3 291 122 ..... 2 f0ef8726ac4f 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
42 4 413 87 ..... 4 0b76e38b4070 000000000000 000000000000 (re) |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
43 |
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
44 $ for i in 012 021 102 120 201 210 manifest-file; do |
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
45 > echo $i |
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
46 > hg debugindex $i |
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
47 > echo |
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
48 > done |
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
49 012 |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
50 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
51 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
52 1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
53 2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
54 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
55 021 |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
56 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
57 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
58 1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
59 2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
60 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
61 102 |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
62 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
63 0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
64 1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
65 2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
66 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
67 120 |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
68 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
69 0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
70 1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
71 2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
72 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
73 201 |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
74 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
75 0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
76 1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
77 2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
78 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
79 210 |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
80 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
81 0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
82 1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
83 2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
84 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
85 manifest-file |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
86 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
87 0 0 3 ..... 3 b8e02f643373 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
88 1 3 3 ..... 4 5d9299349fc0 000000000000 000000000000 (re) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
89 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12640
diff
changeset
|
90 $ cd .. |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
91 $ for i in 0 1 2 3 4; do |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
92 > hg clone -q -U --pull crossed $i |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
93 > echo "% Trying to strip revision $i" |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12537
diff
changeset
|
94 > hg --cwd $i strip $i |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
95 > echo "% Verifying" |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
96 > hg --cwd $i verify |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
97 > echo |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
98 > done |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
99 % Trying to strip revision 0 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12537
diff
changeset
|
100 saved backup bundle to $TESTTMP/0/.hg/strip-backup/*-backup.hg (glob) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
101 % Verifying |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
102 checking changesets |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
103 checking manifests |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
104 crosschecking files in changesets and manifests |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
105 checking files |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
106 7 files, 4 changesets, 15 total revisions |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
107 |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
108 % Trying to strip revision 1 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12537
diff
changeset
|
109 saved backup bundle to $TESTTMP/1/.hg/strip-backup/*-backup.hg (glob) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
110 % Verifying |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
111 checking changesets |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
112 checking manifests |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
113 crosschecking files in changesets and manifests |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
114 checking files |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
115 7 files, 4 changesets, 14 total revisions |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
116 |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
117 % Trying to strip revision 2 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12537
diff
changeset
|
118 saved backup bundle to $TESTTMP/2/.hg/strip-backup/*-backup.hg (glob) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
119 % Verifying |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
120 checking changesets |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
121 checking manifests |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
122 crosschecking files in changesets and manifests |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
123 checking files |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
124 7 files, 4 changesets, 14 total revisions |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
125 |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
126 % Trying to strip revision 3 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12537
diff
changeset
|
127 saved backup bundle to $TESTTMP/3/.hg/strip-backup/*-backup.hg (glob) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
128 % Verifying |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
129 checking changesets |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
130 checking manifests |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
131 crosschecking files in changesets and manifests |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
132 checking files |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
133 7 files, 4 changesets, 19 total revisions |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
134 |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
135 % Trying to strip revision 4 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12537
diff
changeset
|
136 saved backup bundle to $TESTTMP/4/.hg/strip-backup/*-backup.hg (glob) |
12492
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
137 % Verifying |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
138 checking changesets |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
139 checking manifests |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
140 crosschecking files in changesets and manifests |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
141 checking files |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
142 7 files, 4 changesets, 19 total revisions |
72be1ab55d62
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com>
parents:
11208
diff
changeset
|
143 |