Mercurial > hg
annotate tests/test-repair-strip.t @ 42619:20d0e59be79b
tests: show the files fields of changelogs for many merges
I don't think there's coverage for many of the subtle cases, and I
found it hard to understand what the code is doing by reading it. The
test takes 40s to run on a laptop, or 9s with --chg.
I have yet to find a description of what the files field is supposed
to be for merges. I thought it could be one of:
1. the files added/modified/removed relative to p1 (wouldn't seem
useful, but `hg diff -c -r mergerev` has this behavior)
2. the files with filelog nodes not in either parent (i.e., what is
needed to create a bundle out of a commit)
3. the files added/removed/modified files by merge itself [1]
It's clearly not 1, because file contents merges are symmetric. It's
clearly not 2 because removed files and exec bit changes are
listed. It's also not 3 but I think it's intended to be 3 and the
differences are bugs.
Assuming 3, the test shows that, for merges, the list of files both
overapproximates and underapproximates. All the cases involve file
changes not in the filelog but in the manifest (existence of file
at revision, exec bit and file vs symlink).
I didn't look at all underapproximations, but they looked minor. The
two overapproximations are problematic though because they both cause
potentially long lists of files when merging cleanly.
[1] even what it means for the merge commit itself to change a file is
not completely trivial. A file in the merge being the same as in one
of the parent is too lax as it would consider that merges change
nothing when they revert all the changes done on one side. The
criteria used in the test and in the next commit for "merge didn't
touch a file" is:
- the parents and the merge all have the same file
- or, one parent didn't touch the file and the other parent contains
the same file as the merge
Differential Revision: https://phab.mercurial-scm.org/D6612
author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
---|---|
date | Tue, 02 Jul 2019 12:55:51 -0400 |
parents | b6673e9bdcf6 |
children | 76d32a0edbc6 |
rev | line source |
---|---|
37425
e1d4be95cd68
tests: require revlog store with test-repair-strip.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37410
diff
changeset
|
1 #require unix-permissions no-root reporevlogstore |
14022
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 |
27993
afb86ee925bf
tests: dump journal file by python script instead of sed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22047
diff
changeset
|
3 $ cat > $TESTTMP/dumpjournal.py <<EOF |
afb86ee925bf
tests: dump journal file by python script instead of sed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22047
diff
changeset
|
4 > import sys |
afb86ee925bf
tests: dump journal file by python script instead of sed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22047
diff
changeset
|
5 > for entry in sys.stdin.read().split('\n'): |
afb86ee925bf
tests: dump journal file by python script instead of sed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22047
diff
changeset
|
6 > if entry: |
33720
27fb986e54d0
tests: fix simple heredoc print statements to work on Py3
Augie Fackler <augie@google.com>
parents:
32940
diff
changeset
|
7 > print(entry.split('\x00')[0]) |
27993
afb86ee925bf
tests: dump journal file by python script instead of sed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22047
diff
changeset
|
8 > EOF |
afb86ee925bf
tests: dump journal file by python script instead of sed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22047
diff
changeset
|
9 |
14022
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 $ echo "[extensions]" >> $HGRCPATH |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
11 $ echo "mq=">> $HGRCPATH |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
12 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
13 $ teststrip() { |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
14 > hg -q up -C $1 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
15 > echo % before update $1, strip $2 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
16 > hg parents |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
17 > chmod -$3 $4 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
18 > hg strip $2 2>&1 | sed 's/\(bundle\).*/\1/' | sed 's/Permission denied.*\.hg\/store\/\(.*\)/Permission denied \.hg\/store\/\1/' |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
19 > echo % after update $1, strip $2 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
20 > chmod +$3 $4 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
21 > hg verify |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
22 > echo % journal contents |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
23 > if [ -f .hg/store/journal ]; then |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39489
diff
changeset
|
24 > cat .hg/store/journal | "$PYTHON" $TESTTMP/dumpjournal.py |
14022
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
25 > else |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
26 > echo "(no journal)" |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
27 > fi |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
28 > ls .hg/store/journal >/dev/null 2>&1 && hg recover |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
29 > ls .hg/strip-backup/* >/dev/null 2>&1 && hg unbundle -q .hg/strip-backup/* |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
30 > rm -rf .hg/strip-backup |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
31 > } |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
32 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
33 $ hg init test |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
34 $ cd test |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
35 $ echo a > a |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
36 $ hg -q ci -m "a" -A |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
37 $ echo b > b |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
38 $ hg -q ci -m "b" -A |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
39 $ echo b2 >> b |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
40 $ hg -q ci -m "b2" -A |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
41 $ echo c > c |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
42 $ hg -q ci -m "c" -A |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
43 $ teststrip 0 2 w .hg/store/data/b.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
44 % before update 0, strip 2 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
45 changeset: 0:cb9a9f314b8b |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
46 user: test |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
47 date: Thu Jan 01 00:00:00 1970 +0000 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
48 summary: a |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
49 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
50 saved backup bundle |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
51 transaction abort! |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
52 failed to truncate data/b.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
53 rollback failed - please run hg recover |
40579
aca09df32819
transaction: display data about why the transaction failed to rollback
Boris Feld <boris.feld@octobus.net>
parents:
39707
diff
changeset
|
54 (failure reason: [Errno 13] Permission denied .hg/store/data/b.i') |
29954
769aee32fae0
strip: don't use "full" and "partial" to describe bundles
Martin von Zweigbergk <martinvonz@google.com>
parents:
27993
diff
changeset
|
55 strip failed, backup bundle |
41420
b6673e9bdcf6
dispatch: quote filename in IOError as well
Yuya Nishihara <yuya@tcha.org>
parents:
40579
diff
changeset
|
56 abort: Permission denied .hg/store/data/b.i' |
14022
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
57 % after update 0, strip 2 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
58 abandoned transaction found - run hg recover |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
59 checking changesets |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
60 checking manifests |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
61 crosschecking files in changesets and manifests |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
62 checking files |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
63 b@?: rev 1 points to nonexistent changeset 2 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
64 (expected 1) |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
65 b@?: 736c29771fba not in manifests |
37410
a6651f5e2c78
verify: drop "revlog" from warning message
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33720
diff
changeset
|
66 warning: orphan data file 'data/c.i' |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
37425
diff
changeset
|
67 checked 2 changesets with 3 changes to 2 files |
14022
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
68 2 warnings encountered! |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
69 2 integrity errors encountered! |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
70 % journal contents |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
71 00changelog.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
72 00manifest.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
73 data/b.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
74 data/c.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
75 rolling back interrupted transaction |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
76 checking changesets |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
77 checking manifests |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
78 crosschecking files in changesets and manifests |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
79 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
37425
diff
changeset
|
80 checked 2 changesets with 2 changes to 2 files |
14022
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
81 $ teststrip 0 2 r .hg/store/data/b.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
82 % before update 0, strip 2 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
83 changeset: 0:cb9a9f314b8b |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
84 user: test |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
85 date: Thu Jan 01 00:00:00 1970 +0000 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
86 summary: a |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
87 |
41420
b6673e9bdcf6
dispatch: quote filename in IOError as well
Yuya Nishihara <yuya@tcha.org>
parents:
40579
diff
changeset
|
88 abort: Permission denied .hg/store/data/b.i' |
14022
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
89 % after update 0, strip 2 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
90 checking changesets |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
91 checking manifests |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
92 crosschecking files in changesets and manifests |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
93 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
37425
diff
changeset
|
94 checked 4 changesets with 4 changes to 3 files |
14022
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
95 % journal contents |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
96 (no journal) |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
97 $ teststrip 0 2 w .hg/store/00manifest.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
98 % before update 0, strip 2 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
99 changeset: 0:cb9a9f314b8b |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
100 user: test |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
101 date: Thu Jan 01 00:00:00 1970 +0000 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
102 summary: a |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
103 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
104 saved backup bundle |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
105 transaction abort! |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
106 failed to truncate 00manifest.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
107 rollback failed - please run hg recover |
40579
aca09df32819
transaction: display data about why the transaction failed to rollback
Boris Feld <boris.feld@octobus.net>
parents:
39707
diff
changeset
|
108 (failure reason: [Errno 13] Permission denied .hg/store/00manifest.i') |
29954
769aee32fae0
strip: don't use "full" and "partial" to describe bundles
Martin von Zweigbergk <martinvonz@google.com>
parents:
27993
diff
changeset
|
109 strip failed, backup bundle |
41420
b6673e9bdcf6
dispatch: quote filename in IOError as well
Yuya Nishihara <yuya@tcha.org>
parents:
40579
diff
changeset
|
110 abort: Permission denied .hg/store/00manifest.i' |
14022
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
111 % after update 0, strip 2 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
112 abandoned transaction found - run hg recover |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
113 checking changesets |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
114 checking manifests |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
115 manifest@?: rev 2 points to nonexistent changeset 2 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
116 manifest@?: 3362547cdf64 not in changesets |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
117 manifest@?: rev 3 points to nonexistent changeset 3 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
118 manifest@?: 265a85892ecb not in changesets |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
119 crosschecking files in changesets and manifests |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
120 c@3: in manifest but not in changeset |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
121 checking files |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
122 b@?: rev 1 points to nonexistent changeset 2 |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
123 (expected 1) |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
124 c@?: rev 0 points to nonexistent changeset 3 |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
37425
diff
changeset
|
125 checked 2 changesets with 4 changes to 3 files |
14022
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
126 1 warnings encountered! |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
127 7 integrity errors encountered! |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
128 (first damaged changeset appears to be 3) |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
129 % journal contents |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
130 00changelog.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
131 00manifest.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
132 data/b.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
133 data/c.i |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
134 rolling back interrupted transaction |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
135 checking changesets |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
136 checking manifests |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
137 crosschecking files in changesets and manifests |
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
138 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
37425
diff
changeset
|
139 checked 2 changesets with 2 changes to 2 files |
14022
f8e1dc896e5f
test-repair-strip: turn into new style test
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
140 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15443
diff
changeset
|
141 $ cd .. |