Mercurial > hg
annotate tests/test-obsolete-bundle-strip.t @ 49327:5bc3e76f919d
bundlespec: do not overwrite bundlespec value with the config one
This is finally making the `obsolete` bundlespec paramater work.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 24 May 2022 18:43:24 +0200 |
parents | 61ba04693d65 |
children | aaa7df6992ea |
rev | line source |
---|---|
32487
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 ================================================== |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 Test obsmarkers interaction with bundle and strip |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 ================================================== |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 Setup a repository with various case |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 ==================================== |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 Config setup |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 ------------ |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 $ cat >> $HGRCPATH <<EOF |
45765
ed84a4d48910
config: add a new [command-templates] section for templates defined by hg
Martin von Zweigbergk <martinvonz@google.com>
parents:
42893
diff
changeset
|
12 > [command-templates] |
32487
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 > # simpler log output |
45765
ed84a4d48910
config: add a new [command-templates] section for templates defined by hg
Martin von Zweigbergk <martinvonz@google.com>
parents:
42893
diff
changeset
|
14 > log = "{node|short}: {desc}\n" |
32487
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
15 > |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
16 > [experimental] |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
17 > # enable evolution |
34865
a0100f34e20b
config: replace experimental.stabilization by experimental.evolution
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
18 > evolution=true |
32487
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
19 > |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
20 > # include obsmarkers in bundle |
34869
196548113ddd
config: rename stabilization.bundle-obsmarker
Boris Feld <boris.feld@octobus.net>
parents:
34865
diff
changeset
|
21 > evolution.bundle-obsmarker = yes |
32487
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
22 > |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
23 > [extensions] |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
24 > # needed for some tests |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
25 > strip = |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
26 > [defaults] |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
27 > # we'll query many hidden changeset |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
28 > debugobsolete = --hidden |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
29 > EOF |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
30 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
31 $ mkcommit() { |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
32 > echo "$1" > "$1" |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
33 > hg add "$1" |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
34 > hg ci -m "$1" |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
35 > } |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
36 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
37 $ getid() { |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
38 > hg log --hidden --template '{node}\n' --rev "$1" |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
39 > } |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
40 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
41 $ mktestrepo () { |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
42 > [ -n "$1" ] || exit 1 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
43 > cd $TESTTMP |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
44 > hg init $1 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
45 > cd $1 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
46 > mkcommit ROOT |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
47 > } |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
48 |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
49 Function to compare the expected bundled obsmarkers with the actually bundled |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
50 obsmarkers. It also check the obsmarkers backed up during strip. |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
51 |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
52 $ testrevs () { |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
53 > revs="$1" |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
54 > testname=`basename \`pwd\`` |
32685
8b2f735f0107
test-obsolete-bundle-strip: do not include \n in filename (issue5586)
Yuya Nishihara <yuya@tcha.org>
parents:
32681
diff
changeset
|
55 > revsname=`hg --hidden log -T '-{desc}' --rev "${revs}"` |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
56 > prefix="${TESTTMP}/${testname}${revsname}" |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
57 > markersfile="${prefix}-relevant-markers.txt" |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
58 > exclufile="${prefix}-exclusive-markers.txt" |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
59 > bundlefile="${prefix}-bundle.hg" |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
60 > contentfile="${prefix}-bundle-markers.hg" |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
61 > stripcontentfile="${prefix}-bundle-markers.hg" |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
62 > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
63 > hg debugobsolete --hidden --rev "${revs}" --exclusive | sed 's/^/ /' > "${exclufile}" |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
64 > echo '### Matched revisions###' |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
65 > hg log --hidden --rev "${revs}" | sort |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
66 > echo '### Relevant markers ###' |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
67 > cat "${markersfile}" |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
68 > printf "# bundling: " |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
69 > hg bundle --hidden --base "parents(roots(${revs}))" --rev "${revs}" "${bundlefile}" |
32694
3ef319e9505f
debugbundle: add --part-type flag to emit only named part types
Danek Duvall <danek.duvall@oracle.com>
parents:
32693
diff
changeset
|
70 > hg debugbundle --part-type obsmarkers "${bundlefile}" | sed 1,3d > "${contentfile}" |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
71 > echo '### Bundled markers ###' |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
72 > cat "${contentfile}" |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
73 > echo '### diff <relevant> <bundled> ###' |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
74 > cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}" |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
75 > echo '#################################' |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
76 > echo '### Exclusive markers ###' |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
77 > cat "${exclufile}" |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
78 > # if the matched revs do not have children, we also check the result of strip |
32681
d677bd21ee98
tests: simplify and clarify test-obsolete-bundle-strip.t a little
Martin von Zweigbergk <martinvonz@google.com>
parents:
32680
diff
changeset
|
79 > children=`hg log --hidden --rev "((${revs})::) - (${revs})"` |
d677bd21ee98
tests: simplify and clarify test-obsolete-bundle-strip.t a little
Martin von Zweigbergk <martinvonz@google.com>
parents:
32680
diff
changeset
|
80 > if [ -z "$children" ]; |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
81 > then |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
82 > printf "# stripping: " |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
83 > prestripfile="${prefix}-pre-strip.txt" |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
84 > poststripfile="${prefix}-post-strip.txt" |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
85 > strippedfile="${prefix}-stripped-markers.txt" |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
86 > hg debugobsolete --hidden | sort | sed 's/^/ /' > "${prestripfile}" |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
87 > hg strip --hidden --rev "${revs}" |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
88 > hg debugobsolete --hidden | sort | sed 's/^/ /' > "${poststripfile}" |
32694
3ef319e9505f
debugbundle: add --part-type flag to emit only named part types
Danek Duvall <danek.duvall@oracle.com>
parents:
32693
diff
changeset
|
89 > hg debugbundle --part-type obsmarkers .hg/strip-backup/* | sed 1,3d > "${stripcontentfile}" |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
90 > echo '### Backup markers ###' |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
91 > cat "${stripcontentfile}" |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
92 > echo '### diff <relevant> <backed-up> ###' |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
93 > cmp "${markersfile}" "${stripcontentfile}" || diff -u "${markersfile}" "${stripcontentfile}" |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
94 > echo '#################################' |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
95 > cat "${prestripfile}" "${poststripfile}" | sort | uniq -u > "${strippedfile}" |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
96 > echo '### Stripped markers ###' |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
97 > cat "${strippedfile}" |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
98 > echo '### diff <exclusive> <stripped> ###' |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
99 > cmp "${exclufile}" "${strippedfile}" || diff -u "${exclufile}" "${strippedfile}" |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
100 > echo '#################################' |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
101 > # restore and clean up repo for the next test |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
102 > hg unbundle .hg/strip-backup/* | sed 's/^/# unbundling: /' |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
103 > # clean up directory for the next test |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
104 > rm .hg/strip-backup/* |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
105 > fi |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
106 > } |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
107 |
32487
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
108 root setup |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
109 ------------- |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
110 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
111 simple chain |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
112 ============ |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
113 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
114 . A0 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
115 . ⇠ø⇠◔ A1 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
116 . |/ |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
117 . ● |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
118 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
119 setup |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
120 ----- |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
121 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
122 $ mktestrepo simple-chain |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
123 $ mkcommit 'C-A0' |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
124 $ hg up 'desc("ROOT")' |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
125 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
126 $ mkcommit 'C-A1' |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
127 created new head |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
128 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
129 1 new obsolescence markers |
32487
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
130 $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
131 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
132 obsoleted 1 changesets |
32487
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
133 $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
134 1 new obsolescence markers |
32487
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
135 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
136 $ hg up 'desc("ROOT")' |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
137 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
138 $ hg log --hidden -G |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
139 o cf2c22470d67: C-A1 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
140 | |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
141 | x 84fcb0dfe17b: C-A0 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
142 |/ |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
143 @ ea207398892e: ROOT |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
144 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
145 $ hg debugobsolete |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
146 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
147 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
148 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
149 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
150 Actual testing |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
151 -------------- |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
152 |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
153 $ testrevs 'desc("C-A0")' |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
154 ### Matched revisions### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
155 84fcb0dfe17b: C-A0 |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
156 ### Relevant markers ### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
157 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
158 # bundling: 1 changesets found |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
159 ### Bundled markers ### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
160 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
161 ### diff <relevant> <bundled> ### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
162 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
163 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
164 # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
165 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
166 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
167 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
168 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
169 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
170 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
171 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
172 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
173 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
174 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
175 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
176 # unbundling: (1 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
177 # unbundling: (run 'hg heads' to see heads) |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
178 |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
179 $ testrevs 'desc("C-A1")' |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
180 ### Matched revisions### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
181 cf2c22470d67: C-A1 |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
182 ### Relevant markers ### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
183 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
184 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
185 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
186 # bundling: 1 changesets found |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
187 ### Bundled markers ### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
188 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
189 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
190 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
191 ### diff <relevant> <bundled> ### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
192 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
193 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
194 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
195 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
196 # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
197 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
198 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
199 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
200 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
201 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
202 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
203 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
204 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
205 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
206 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
207 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
208 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
209 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
210 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
211 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
212 # unbundling: 2 new obsolescence markers |
33252
53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32694
diff
changeset
|
213 # unbundling: obsoleted 1 changesets |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
214 # unbundling: new changesets cf2c22470d67 (1 drafts) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
215 # unbundling: (run 'hg heads' to see heads) |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
216 |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
217 $ testrevs 'desc("C-A")' |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
218 ### Matched revisions### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
219 84fcb0dfe17b: C-A0 |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
220 cf2c22470d67: C-A1 |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
221 ### Relevant markers ### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
222 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
223 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
224 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
225 # bundling: 2 changesets found |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
226 ### Bundled markers ### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
227 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
228 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
229 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
230 ### diff <relevant> <bundled> ### |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
231 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
232 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
233 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
234 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
235 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
236 # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
237 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
238 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
239 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
240 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
241 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
242 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
243 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
244 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
245 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
246 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
247 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
248 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
249 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
250 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
251 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
252 # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
253 # unbundling: 3 new obsolescence markers |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
254 # unbundling: new changesets cf2c22470d67 (1 drafts) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
255 # unbundling: (1 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
256 # unbundling: (run 'hg heads' to see heads) |
32488
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
257 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
258 chain with prune children |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
259 ========================= |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
260 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
261 . ⇠⊗ B0 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
262 . | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
263 . ⇠ø⇠◔ A1 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
264 . | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
265 . ● |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
266 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
267 setup |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
268 ----- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
269 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
270 $ mktestrepo prune |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
271 $ mkcommit 'C-A0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
272 $ mkcommit 'C-B0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
273 $ hg up 'desc("ROOT")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
274 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
275 $ mkcommit 'C-A1' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
276 created new head |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
277 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
278 1 new obsolescence markers |
32488
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
279 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
280 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
281 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
282 1 new orphan changesets |
32488
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
283 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
284 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
285 obsoleted 1 changesets |
32488
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
286 $ hg up 'desc("ROOT")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
287 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
288 $ hg log --hidden -G |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
289 o cf2c22470d67: C-A1 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
290 | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
291 | x 29f93b1df87b: C-B0 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
292 | | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
293 | x 84fcb0dfe17b: C-A0 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
294 |/ |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
295 @ ea207398892e: ROOT |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
296 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
297 $ hg debugobsolete |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
298 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
299 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
300 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
301 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
302 Actual testing |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
303 -------------- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
304 |
32598
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
305 $ testrevs 'desc("C-A0")' |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
306 ### Matched revisions### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
307 84fcb0dfe17b: C-A0 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
308 ### Relevant markers ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
309 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
310 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
311 # bundling: 1 changesets found |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
312 ### Bundled markers ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
313 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
314 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
315 ### diff <relevant> <bundled> ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
316 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
317 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
318 |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
319 (The strip markers is considered exclusive to the pruned changeset even if it |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
320 is also considered "relevant" to its parent. This allows to strip prune |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
321 markers. This avoid leaving prune markers from dead-end that could be |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
322 problematic) |
32598
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
323 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
324 $ testrevs 'desc("C-B0")' |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
325 ### Matched revisions### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
326 29f93b1df87b: C-B0 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
327 ### Relevant markers ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
328 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
329 # bundling: 1 changesets found |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
330 ### Bundled markers ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
331 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
332 ### diff <relevant> <bundled> ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
333 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
334 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
335 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
336 # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/29f93b1df87b-7fb32101-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
337 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
338 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
339 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
340 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
341 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
342 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
343 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
344 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
345 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
346 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
347 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
348 # unbundling: added 1 changesets with 1 changes to 1 files |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
349 # unbundling: 1 new obsolescence markers |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
350 # unbundling: (1 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
351 # unbundling: (run 'hg update' to get a working copy) |
32598
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
352 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
353 $ testrevs 'desc("C-A1")' |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
354 ### Matched revisions### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
355 cf2c22470d67: C-A1 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
356 ### Relevant markers ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
357 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
358 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
359 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
360 # bundling: 1 changesets found |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
361 ### Bundled markers ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
362 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
363 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
364 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
365 ### diff <relevant> <bundled> ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
366 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
367 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
368 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
369 # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
370 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
371 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
372 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
373 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
374 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
375 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
376 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
377 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
378 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
379 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
380 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
381 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
382 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
383 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
384 # unbundling: 1 new obsolescence markers |
33252
53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32694
diff
changeset
|
385 # unbundling: obsoleted 1 changesets |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
386 # unbundling: new changesets cf2c22470d67 (1 drafts) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
387 # unbundling: (run 'hg heads' to see heads) |
32598
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
388 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
389 bundling multiple revisions |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
390 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
391 $ testrevs 'desc("C-A")' |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
392 ### Matched revisions### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
393 84fcb0dfe17b: C-A0 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
394 cf2c22470d67: C-A1 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
395 ### Relevant markers ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
396 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
397 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
398 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
399 # bundling: 2 changesets found |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
400 ### Bundled markers ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
401 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
402 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
403 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
404 ### diff <relevant> <bundled> ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
405 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
406 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
407 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
408 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32598
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
409 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
410 $ testrevs 'desc("C-")' |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
411 ### Matched revisions### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
412 29f93b1df87b: C-B0 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
413 84fcb0dfe17b: C-A0 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
414 cf2c22470d67: C-A1 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
415 ### Relevant markers ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
416 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
417 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
418 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
419 # bundling: 3 changesets found |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
420 ### Bundled markers ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
421 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
422 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
423 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
424 ### diff <relevant> <bundled> ### |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
425 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
426 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
427 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
428 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
429 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
430 # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-884c33b0-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
431 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
432 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
433 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
434 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
435 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
436 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
437 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
438 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
439 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
440 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
441 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
442 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
443 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
444 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
445 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
446 # unbundling: added 3 changesets with 3 changes to 3 files (+1 heads) |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
447 # unbundling: 3 new obsolescence markers |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
448 # unbundling: new changesets cf2c22470d67 (1 drafts) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
449 # unbundling: (2 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
450 # unbundling: (run 'hg heads' to see heads) |
32488
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
451 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
452 chain with precursors also pruned |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
453 ================================= |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
454 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
455 . A0 (also pruned) |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
456 . ⇠ø⇠◔ A1 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
457 . | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
458 . ● |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
459 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
460 setup |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
461 ----- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
462 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
463 $ mktestrepo prune-inline |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
464 $ mkcommit 'C-A0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
465 $ hg up 'desc("ROOT")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
466 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
467 $ mkcommit 'C-A1' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
468 created new head |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
469 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
470 1 new obsolescence markers |
32488
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
471 $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
472 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
473 obsoleted 1 changesets |
32488
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
474 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
475 1 new obsolescence markers |
32488
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
476 $ hg up 'desc("ROOT")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
477 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
478 $ hg log --hidden -G |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
479 o cf2c22470d67: C-A1 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
480 | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
481 | x 84fcb0dfe17b: C-A0 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
482 |/ |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
483 @ ea207398892e: ROOT |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
484 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
485 $ hg debugobsolete |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
486 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
487 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
488 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
489 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
490 Actual testing |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
491 -------------- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
492 |
32599
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
493 $ testrevs 'desc("C-A0")' |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
494 ### Matched revisions### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
495 84fcb0dfe17b: C-A0 |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
496 ### Relevant markers ### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
497 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
498 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
499 # bundling: 1 changesets found |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
500 ### Bundled markers ### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
501 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
502 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
503 ### diff <relevant> <bundled> ### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
504 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
505 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
506 # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
507 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
508 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
509 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
510 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
511 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
512 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
513 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
514 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
515 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
516 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
517 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
518 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
519 # unbundling: (1 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
520 # unbundling: (run 'hg heads' to see heads) |
32599
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
521 |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
522 $ testrevs 'desc("C-A1")' |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
523 ### Matched revisions### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
524 cf2c22470d67: C-A1 |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
525 ### Relevant markers ### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
526 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
527 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
528 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
529 # bundling: 1 changesets found |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
530 ### Bundled markers ### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
531 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
532 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
533 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
534 ### diff <relevant> <bundled> ### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
535 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
536 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
537 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
538 # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
539 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
540 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
541 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
542 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
543 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
544 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
545 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
546 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
547 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
548 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
549 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
550 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
551 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
552 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
553 # unbundling: 1 new obsolescence markers |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
554 # unbundling: new changesets cf2c22470d67 (1 drafts) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
555 # unbundling: (run 'hg heads' to see heads) |
32599
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
556 |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
557 $ testrevs 'desc("C-A")' |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
558 ### Matched revisions### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
559 84fcb0dfe17b: C-A0 |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
560 cf2c22470d67: C-A1 |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
561 ### Relevant markers ### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
562 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
563 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
564 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
565 # bundling: 2 changesets found |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
566 ### Bundled markers ### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
567 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
568 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
569 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
570 ### diff <relevant> <bundled> ### |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
571 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
572 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
573 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
574 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
575 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
576 # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
577 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
578 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
579 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
580 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
581 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
582 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
583 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
584 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
585 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
586 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
587 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
588 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
589 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
590 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
591 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
592 # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
593 # unbundling: 3 new obsolescence markers |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
594 # unbundling: new changesets cf2c22470d67 (1 drafts) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
595 # unbundling: (1 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
596 # unbundling: (run 'hg heads' to see heads) |
32489
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
597 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
598 chain with missing prune |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
599 ======================== |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
600 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
601 . ⊗ B |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
602 . | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
603 . ⇠◌⇠◔ A1 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
604 . | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
605 . ● |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
606 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
607 setup |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
608 ----- |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
609 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
610 $ mktestrepo missing-prune |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
611 $ mkcommit 'C-A0' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
612 $ mkcommit 'C-B0' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
613 $ hg up 'desc("ROOT")' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
614 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
615 $ mkcommit 'C-A1' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
616 created new head |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
617 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
618 1 new obsolescence markers |
32489
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
619 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
620 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
621 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
622 1 new orphan changesets |
32489
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
623 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
624 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
625 obsoleted 1 changesets |
32489
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
626 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
627 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
628 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
629 $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no |
32489
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
630 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
631 $ hg up 'desc("ROOT")' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
632 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
633 $ hg log --hidden -G |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
634 o cf2c22470d67: C-A1 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
635 | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
636 @ ea207398892e: ROOT |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
637 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
638 $ hg debugobsolete |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
639 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
640 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
641 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
642 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
643 Actual testing |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
644 -------------- |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
645 |
32600
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
646 $ testrevs 'desc("C-A1")' |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
647 ### Matched revisions### |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
648 cf2c22470d67: C-A1 |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
649 ### Relevant markers ### |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
650 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
651 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
652 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
653 # bundling: 1 changesets found |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
654 ### Bundled markers ### |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
655 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
656 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
657 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
658 ### diff <relevant> <bundled> ### |
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
659 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
660 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
661 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
662 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
663 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
664 # stripping: saved backup bundle to $TESTTMP/missing-prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
665 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
666 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
667 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
668 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
669 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
670 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
671 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
672 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
673 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
674 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
675 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
676 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
677 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
678 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
679 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
680 # unbundling: added 1 changesets with 1 changes to 1 files |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
681 # unbundling: 3 new obsolescence markers |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
682 # unbundling: new changesets cf2c22470d67 (1 drafts) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
683 # unbundling: (run 'hg update' to get a working copy) |
32489
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
684 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
685 chain with precursors also pruned |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
686 ================================= |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
687 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
688 . A0 (also pruned) |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
689 . ⇠◌⇠◔ A1 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
690 . | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
691 . ● |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
692 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
693 setup |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
694 ----- |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
695 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
696 $ mktestrepo prune-inline-missing |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
697 $ mkcommit 'C-A0' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
698 $ hg up 'desc("ROOT")' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
699 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
700 $ mkcommit 'C-A1' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
701 created new head |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
702 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
703 1 new obsolescence markers |
32489
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
704 $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
705 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
706 obsoleted 1 changesets |
32489
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
707 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
708 1 new obsolescence markers |
32489
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
709 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
710 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
711 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
712 $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no |
32489
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
713 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
714 $ hg up 'desc("ROOT")' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
715 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
716 $ hg log --hidden -G |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
717 o cf2c22470d67: C-A1 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
718 | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
719 @ ea207398892e: ROOT |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
720 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
721 $ hg debugobsolete |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
722 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
723 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
724 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
725 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
726 Actual testing |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
727 -------------- |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
728 |
32601
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
729 $ testrevs 'desc("C-A1")' |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
730 ### Matched revisions### |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
731 cf2c22470d67: C-A1 |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
732 ### Relevant markers ### |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
733 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
734 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
735 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
736 # bundling: 1 changesets found |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
737 ### Bundled markers ### |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
738 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
739 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
740 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
741 ### diff <relevant> <bundled> ### |
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
742 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
743 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
744 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
745 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
746 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
747 # stripping: saved backup bundle to $TESTTMP/prune-inline-missing/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
748 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
749 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
750 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
751 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
752 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
753 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
754 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
755 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
756 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
757 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
758 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
759 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
760 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
761 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
762 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
763 # unbundling: added 1 changesets with 1 changes to 1 files |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
764 # unbundling: 3 new obsolescence markers |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
765 # unbundling: new changesets cf2c22470d67 (1 drafts) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
766 # unbundling: (run 'hg update' to get a working copy) |
32490
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
767 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
768 Chain with fold and split |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
769 ========================= |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
770 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
771 setup |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
772 ----- |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
773 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
774 $ mktestrepo split-fold |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
775 $ mkcommit 'C-A' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
776 $ hg up 'desc("ROOT")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
777 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
778 $ mkcommit 'C-B' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
779 created new head |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
780 $ hg up 'desc("ROOT")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
781 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
782 $ mkcommit 'C-C' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
783 created new head |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
784 $ hg up 'desc("ROOT")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
785 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
786 $ mkcommit 'C-D' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
787 created new head |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
788 $ hg up 'desc("ROOT")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
789 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
790 $ mkcommit 'C-E' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
791 created new head |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
792 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
793 1 new obsolescence markers |
32490
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
794 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
795 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
796 obsoleted 1 changesets |
32490
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
797 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
798 1 new obsolescence markers |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
799 3 new content-divergent changesets |
32490
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
800 $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
801 1 new obsolescence markers |
32490
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
802 $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
803 1 new obsolescence markers |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
804 1 new content-divergent changesets |
32490
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
805 $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
806 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
807 obsoleted 1 changesets |
32490
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
808 $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
809 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
810 obsoleted 1 changesets |
32490
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
811 $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
812 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
813 obsoleted 1 changesets |
32490
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
814 $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
815 1 new obsolescence markers |
32490
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
816 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
817 $ hg up 'desc("ROOT")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
818 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
819 $ hg log --hidden -G |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
820 o 2f20ff6509f0: C-E |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
821 | |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
822 | x 06dc9da25ef0: C-D |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
823 |/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
824 | x 27ec657ca21d: C-C |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
825 |/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
826 | x a9b9da38ed96: C-B |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
827 |/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
828 | x 9ac430e15fca: C-A |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
829 |/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
830 @ ea207398892e: ROOT |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
831 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
832 $ hg debugobsolete |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
833 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
834 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
835 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
836 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
837 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
838 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
839 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
840 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
841 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
842 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
843 Actual testing |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
844 -------------- |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
845 |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
846 $ testrevs 'desc("C-A")' |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
847 ### Matched revisions### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
848 9ac430e15fca: C-A |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
849 ### Relevant markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
850 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
851 # bundling: 1 changesets found |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
852 ### Bundled markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
853 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
854 ### diff <relevant> <bundled> ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
855 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
856 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
857 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-81204eba-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
858 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
859 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
860 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
861 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
862 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
863 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
864 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
865 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
866 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
867 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
868 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
869 # unbundling: (1 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
870 # unbundling: (run 'hg heads' to see heads) |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
871 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
872 $ testrevs 'desc("C-B")' |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
873 ### Matched revisions### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
874 a9b9da38ed96: C-B |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
875 ### Relevant markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
876 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
877 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
878 # bundling: 1 changesets found |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
879 ### Bundled markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
880 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
881 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
882 ### diff <relevant> <bundled> ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
883 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
884 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
885 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-7465d6e9-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
886 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
887 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
888 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
889 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
890 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
891 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
892 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
893 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
894 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
895 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
896 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
897 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
898 # unbundling: (1 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
899 # unbundling: (run 'hg heads' to see heads) |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
900 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
901 $ testrevs 'desc("C-C")' |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
902 ### Matched revisions### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
903 27ec657ca21d: C-C |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
904 ### Relevant markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
905 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
906 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
907 # bundling: 1 changesets found |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
908 ### Bundled markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
909 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
910 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
911 ### diff <relevant> <bundled> ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
912 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
913 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
914 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/27ec657ca21d-d5dd1c7c-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
915 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
916 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
917 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
918 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
919 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
920 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
921 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
922 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
923 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
924 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
925 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
926 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
927 # unbundling: (1 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
928 # unbundling: (run 'hg heads' to see heads) |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
929 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
930 $ testrevs 'desc("C-D")' |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
931 ### Matched revisions### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
932 06dc9da25ef0: C-D |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
933 ### Relevant markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
934 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
935 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
936 # bundling: 1 changesets found |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
937 ### Bundled markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
938 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
939 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
940 ### diff <relevant> <bundled> ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
941 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
942 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
943 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/06dc9da25ef0-9b1c0a91-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
944 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
945 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
946 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
947 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
948 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
949 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
950 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
951 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
952 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
953 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
954 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
955 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
956 # unbundling: (1 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
957 # unbundling: (run 'hg heads' to see heads) |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
958 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
959 $ testrevs 'desc("C-E")' |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
960 ### Matched revisions### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
961 2f20ff6509f0: C-E |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
962 ### Relevant markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
963 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
964 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
965 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
966 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
967 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
968 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
969 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
970 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
971 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
972 # bundling: 1 changesets found |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
973 ### Bundled markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
974 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
975 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
976 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
977 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
978 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
979 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
980 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
981 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
982 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
983 ### diff <relevant> <bundled> ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
984 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
985 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
986 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
987 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
988 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
989 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
990 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
991 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
992 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
993 3 new content-divergent changesets |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
994 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
995 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
996 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
997 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
998 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
999 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1000 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1001 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1002 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1003 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1004 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1005 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1006 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1007 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1008 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1009 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1010 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1011 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1012 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1013 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1014 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1015 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1016 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1017 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1018 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1019 # unbundling: 6 new obsolescence markers |
33252
53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32694
diff
changeset
|
1020 # unbundling: obsoleted 3 changesets |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1021 # unbundling: new changesets 2f20ff6509f0 (1 drafts) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1022 # unbundling: (run 'hg heads' to see heads) |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1023 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1024 Bundle multiple revisions |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1025 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1026 * each part of the split |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1027 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1028 $ testrevs 'desc("C-B") + desc("C-C")' |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1029 ### Matched revisions### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1030 27ec657ca21d: C-C |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1031 a9b9da38ed96: C-B |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1032 ### Relevant markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1033 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1034 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1035 # bundling: 2 changesets found |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1036 ### Bundled markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1037 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1038 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1039 ### diff <relevant> <bundled> ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1040 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1041 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
1042 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-0daf625a-backup.hg |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1043 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1044 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1045 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1046 ### diff <relevant> <backed-up> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1047 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1048 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1049 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1050 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1051 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1052 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1053 # unbundling: adding file changes |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1054 # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
1055 # unbundling: (2 other changesets obsolete on arrival) |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1056 # unbundling: (run 'hg heads' to see heads) |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1057 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1058 * top one and other divergent |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1059 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1060 $ testrevs 'desc("C-E") + desc("C-D")' |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1061 ### Matched revisions### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1062 06dc9da25ef0: C-D |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1063 2f20ff6509f0: C-E |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1064 ### Relevant markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1065 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1066 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1067 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1068 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1069 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1070 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1071 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1072 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1073 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1074 # bundling: 2 changesets found |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1075 ### Bundled markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1076 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1077 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1078 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1079 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1080 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1081 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1082 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1083 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1084 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1085 ### diff <relevant> <bundled> ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1086 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1087 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1088 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1089 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1090 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1091 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1092 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1093 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1094 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
1095 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-bf1b80f4-backup.hg |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1096 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1097 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1098 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1099 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1100 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1101 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1102 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1103 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1104 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1105 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1106 ### diff <relevant> <backed-up> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1107 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1108 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1109 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1110 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1111 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1112 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1113 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1114 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1115 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1116 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1117 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1118 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1119 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1120 # unbundling: adding file changes |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1121 # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1122 # unbundling: 7 new obsolescence markers |
33252
53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32694
diff
changeset
|
1123 # unbundling: obsoleted 2 changesets |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1124 # unbundling: new changesets 2f20ff6509f0 (1 drafts) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
1125 # unbundling: (1 other changesets obsolete on arrival) |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1126 # unbundling: (run 'hg heads' to see heads) |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1127 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1128 * top one and initial precursors |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1129 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1130 $ testrevs 'desc("C-E") + desc("C-A")' |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1131 ### Matched revisions### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1132 2f20ff6509f0: C-E |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1133 9ac430e15fca: C-A |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1134 ### Relevant markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1135 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1136 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1137 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1138 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1139 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1140 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1141 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1142 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1143 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1144 # bundling: 2 changesets found |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1145 ### Bundled markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1146 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1147 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1148 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1149 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1150 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1151 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1152 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1153 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1154 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1155 ### diff <relevant> <bundled> ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1156 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1157 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1158 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1159 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1160 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1161 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1162 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1163 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
1164 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
1165 3 new content-divergent changesets |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1166 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1167 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1168 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1169 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1170 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1171 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1172 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1173 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1174 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1175 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1176 ### diff <relevant> <backed-up> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1177 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1178 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1179 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1180 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1181 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1182 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1183 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1184 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1185 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1186 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1187 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1188 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1189 # unbundling: adding file changes |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1190 # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1191 # unbundling: 6 new obsolescence markers |
33252
53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32694
diff
changeset
|
1192 # unbundling: obsoleted 3 changesets |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1193 # unbundling: new changesets 2f20ff6509f0 (1 drafts) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
1194 # unbundling: (1 other changesets obsolete on arrival) |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1195 # unbundling: (run 'hg heads' to see heads) |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1196 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1197 * top one and one of the split |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1198 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1199 $ testrevs 'desc("C-E") + desc("C-C")' |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1200 ### Matched revisions### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1201 27ec657ca21d: C-C |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1202 2f20ff6509f0: C-E |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1203 ### Relevant markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1204 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1205 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1206 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1207 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1208 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1209 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1210 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1211 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1212 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1213 # bundling: 2 changesets found |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1214 ### Bundled markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1215 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1216 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1217 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1218 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1219 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1220 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1221 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1222 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1223 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1224 ### diff <relevant> <bundled> ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1225 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1226 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1227 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1228 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1229 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1230 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1231 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1232 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1233 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
1234 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-5fdfcd7d-backup.hg |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1235 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1236 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1237 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1238 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1239 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1240 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1241 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1242 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1243 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1244 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1245 ### diff <relevant> <backed-up> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1246 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1247 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1248 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1249 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1250 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1251 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1252 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1253 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1254 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1255 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1256 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1257 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1258 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1259 # unbundling: adding file changes |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1260 # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1261 # unbundling: 7 new obsolescence markers |
33252
53b3a1968aa6
obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32694
diff
changeset
|
1262 # unbundling: obsoleted 2 changesets |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1263 # unbundling: new changesets 2f20ff6509f0 (1 drafts) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
1264 # unbundling: (1 other changesets obsolete on arrival) |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1265 # unbundling: (run 'hg heads' to see heads) |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1266 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1267 * all |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1268 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1269 $ testrevs 'desc("C-")' |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1270 ### Matched revisions### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1271 06dc9da25ef0: C-D |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1272 27ec657ca21d: C-C |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1273 2f20ff6509f0: C-E |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1274 9ac430e15fca: C-A |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1275 a9b9da38ed96: C-B |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1276 ### Relevant markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1277 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1278 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1279 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1280 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1281 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1282 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1283 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1284 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1285 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1286 # bundling: 5 changesets found |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1287 ### Bundled markers ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1288 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1289 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1290 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1291 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1292 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1293 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1294 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1295 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1296 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1297 ### diff <relevant> <bundled> ### |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1298 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1299 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1300 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1301 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1302 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1303 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1304 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1305 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1306 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1307 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1308 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
1309 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-eeb4258f-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1310 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1311 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1312 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1313 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1314 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1315 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1316 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1317 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1318 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1319 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1320 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1321 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1322 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1323 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1324 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1325 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1326 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1327 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1328 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1329 a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1330 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1331 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1332 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1333 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1334 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1335 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1336 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1337 # unbundling: added 5 changesets with 5 changes to 5 files (+4 heads) |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1338 # unbundling: 9 new obsolescence markers |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1339 # unbundling: new changesets 2f20ff6509f0 (1 drafts) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
1340 # unbundling: (4 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1341 # unbundling: (run 'hg heads' to see heads) |
32491
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1342 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1343 changeset pruned on its own |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1344 =========================== |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1345 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1346 . ⊗ B |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1347 . | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1348 . ◕ A |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1349 . | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1350 . ● |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1351 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1352 setup |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1353 ----- |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1354 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1355 $ mktestrepo lonely-prune |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1356 $ hg up 'desc("ROOT")' |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1357 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1358 $ mkcommit 'C-A' |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1359 $ mkcommit 'C-B' |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1360 $ hg debugobsolete --record-parent `getid 'desc("C-B")'` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39899
diff
changeset
|
1361 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1362 obsoleted 1 changesets |
32491
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1363 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1364 $ hg up 'desc("ROOT")' |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1365 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1366 $ hg log --hidden -G |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1367 x cefb651fc2fd: C-B |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1368 | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1369 o 9ac430e15fca: C-A |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1370 | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1371 @ ea207398892e: ROOT |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1372 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1373 $ hg debugobsolete |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1374 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1375 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1376 Actual testing |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1377 -------------- |
32603
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1378 $ testrevs 'desc("C-A")' |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1379 ### Matched revisions### |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1380 9ac430e15fca: C-A |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1381 ### Relevant markers ### |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1382 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1383 # bundling: 1 changesets found |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1384 ### Bundled markers ### |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1385 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1386 ### diff <relevant> <bundled> ### |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1387 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1388 ### Exclusive markers ### |
32603
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1389 $ testrevs 'desc("C-B")' |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1390 ### Matched revisions### |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1391 cefb651fc2fd: C-B |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1392 ### Relevant markers ### |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1393 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1394 # bundling: 1 changesets found |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1395 ### Bundled markers ### |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1396 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1397 ### diff <relevant> <bundled> ### |
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1398 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1399 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1400 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
1401 # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/cefb651fc2fd-345c8dfa-backup.hg |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1402 ### Backup markers ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1403 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1404 ### diff <relevant> <backed-up> ### |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1405 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1406 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1407 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1408 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1409 ################################# |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1410 # unbundling: adding changesets |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1411 # unbundling: adding manifests |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1412 # unbundling: adding file changes |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1413 # unbundling: added 1 changesets with 1 changes to 1 files |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1414 # unbundling: 1 new obsolescence markers |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
1415 # unbundling: (1 other changesets obsolete on arrival) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
1416 # unbundling: (run 'hg update' to get a working copy) |
32625
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1417 $ testrevs 'desc("C-")' |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1418 ### Matched revisions### |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1419 9ac430e15fca: C-A |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1420 cefb651fc2fd: C-B |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1421 ### Relevant markers ### |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1422 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1423 # bundling: 2 changesets found |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1424 ### Bundled markers ### |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1425 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1426 ### diff <relevant> <bundled> ### |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1427 ################################# |
32627
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1428 ### Exclusive markers ### |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
1429 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
1430 # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/9ac430e15fca-b9855b02-backup.hg |
32625
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1431 ### Backup markers ### |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1432 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1433 ### diff <relevant> <backed-up> ### |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1434 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1435 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1436 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1437 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1438 ################################# |
32625
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1439 # unbundling: adding changesets |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1440 # unbundling: adding manifests |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1441 # unbundling: adding file changes |
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1442 # unbundling: added 2 changesets with 2 changes to 2 files |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1443 # unbundling: 1 new obsolescence markers |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
35709
diff
changeset
|
1444 # unbundling: new changesets 9ac430e15fca (1 drafts) |
39899
f9232b0310ef
pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents:
39480
diff
changeset
|
1445 # unbundling: (1 other changesets obsolete on arrival) |
32625
c618f7ebbcb5
test-obsolete-bundle-strip: check all changesets in the isolated prune case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32624
diff
changeset
|
1446 # unbundling: (run 'hg update' to get a working copy) |
46165
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1447 |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1448 Test that advisory obsolescence markers in bundles are ignored if unsupported |
49323
c8acaaa99210
bundlespec: fix lack of title in a evolve tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46165
diff
changeset
|
1449 ----------------------------------------------------------------------------- |
46165
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1450 |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1451 $ hg init repo-with-obs |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1452 $ cd repo-with-obs |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1453 $ hg debugbuilddag +1 |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1454 $ hg debugobsolete `getid 0` |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1455 1 new obsolescence markers |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1456 obsoleted 1 changesets |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1457 $ hg bundle --config experimental.evolution.bundle-obsmarker=true --config experimental.evolution.bundle-obsmarker:mandatory=false --all --hidden bundle-with-obs |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1458 1 changesets found |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1459 $ cd .. |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1460 $ hg init repo-without-obs |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1461 $ cd repo-without-obs |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1462 $ hg --config experimental.evolution=False unbundle ../repo-with-obs/bundle-with-obs --debug |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1463 bundle2-input-bundle: 1 params with-transaction |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1464 bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1465 adding changesets |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1466 add changeset 1ea73414a91b |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1467 adding manifests |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1468 adding file changes |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1469 bundle2-input-part: total payload size 190 |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1470 bundle2-input-part: "cache:rev-branch-cache" (advisory) supported |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1471 bundle2-input-part: total payload size 39 |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1472 bundle2-input-part: "obsmarkers" (advisory) supported |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1473 bundle2-input-part: total payload size 50 |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1474 ignoring obsolescence markers, feature not enabled |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1475 bundle2-input-bundle: 3 parts total |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1476 updating the branch cache |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1477 added 1 changesets with 0 changes to 0 files |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1478 new changesets 1ea73414a91b (1 drafts) |
41d695a08e90
bundle: optional advisory obsolescence parts
Joerg Sonnenberger <joerg@bec.de>
parents:
45765
diff
changeset
|
1479 (run 'hg update' to get a working copy) |
49324
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1480 $ cd .. |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1481 |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1482 Test bundlespec overwrite default |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1483 --------------------------------- |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1484 |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1485 # move back to the default |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1486 |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1487 $ grep -v evolution.bundle-obsmarker $HGRCPATH > a |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1488 $ mv a $HGRCPATH |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1489 |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1490 $ hg bundle -R repo-with-obs --type 'v2;obsolescence=yes' --all --hidden bundle-type-with-obs |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1491 1 changesets found |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1492 $ hg debugbundle bundle-type-with-obs --part-type obsmarkers |
61ba04693d65
bundlespec: test if the "obsolete=" parameter is read
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49323
diff
changeset
|
1493 Stream params: {Compression: BZ} |
49327
5bc3e76f919d
bundlespec: do not overwrite bundlespec value with the config one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49324
diff
changeset
|
1494 obsmarkers -- {} (mandatory: True) |
5bc3e76f919d
bundlespec: do not overwrite bundlespec value with the config one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49324
diff
changeset
|
1495 version: 1 (50 bytes) |
5bc3e76f919d
bundlespec: do not overwrite bundlespec value with the config one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
49324
diff
changeset
|
1496 1ea73414a91b0920940797d8fc6a11e447f8ea1e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |