Mercurial > hg
annotate tests/test-obsolete-bundle-strip.t @ 36265:b44fac3a49fb
py3: factor out byterepr() which returns an asciified value on py3
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 17 Feb 2018 18:09:56 +0900 |
parents | 1a09dad8b85a |
children | 89630d0b3e23 |
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 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 > [ui] |
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 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 > logtemplate = "{node|short}: {desc}\n" |
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")'` |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
129 $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
130 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
|
131 $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("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
|
132 |
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 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
|
134 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
|
135 $ 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
|
136 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
|
137 | |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
138 | 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
|
139 |/ |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
140 @ 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
|
141 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
142 $ 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
|
143 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
|
144 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
|
145 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
|
146 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
147 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
|
148 -------------- |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
149 |
32597
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
150 $ 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
|
151 ### 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
|
152 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
|
153 ### 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
|
154 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
|
155 # 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
|
156 ### 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
|
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 ### 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
|
159 ################################# |
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
|
160 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
161 # 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
|
162 ### 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
|
163 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
|
164 ### 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
|
165 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
166 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
167 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
168 ################################# |
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
|
169 # 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
|
170 # 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
|
171 # 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
|
172 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
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: (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
|
174 |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
175 $ 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
|
176 ### 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
|
177 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
|
178 ### 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
|
179 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
|
180 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
|
181 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
|
182 # 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
|
183 ### 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
|
184 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
|
185 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
|
186 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
|
187 ### 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
|
188 ################################# |
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
|
189 ### 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
|
190 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
|
191 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
|
192 # 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
|
193 ### 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
|
194 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
|
195 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
|
196 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
|
197 ### 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
|
198 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
199 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
200 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
|
201 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
|
202 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
203 ################################# |
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
|
204 # 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
|
205 # 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
|
206 # 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
|
207 # 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
|
208 # 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
|
209 # unbundling: obsoleted 1 changesets |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
210 # unbundling: new changesets cf2c22470d67 |
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
|
211 # 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
|
212 |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
213 $ 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
|
214 ### 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
|
215 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
|
216 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
|
217 ### 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
|
218 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
|
219 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
|
220 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
|
221 # 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
|
222 ### 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
|
223 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
|
224 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
|
225 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
|
226 ### 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
|
227 ################################# |
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
|
228 ### 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
|
229 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
|
230 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
|
231 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
|
232 # 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
|
233 ### 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
|
234 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
|
235 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
|
236 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
|
237 ### 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
|
238 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
239 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
240 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
|
241 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
|
242 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
|
243 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
244 ################################# |
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
|
245 # 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
|
246 # 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
|
247 # 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
|
248 # 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
|
249 # unbundling: 3 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
250 # unbundling: new changesets cf2c22470d67 |
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
|
251 # 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
|
252 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
253 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
|
254 ========================= |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
255 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
256 . ⇠⊗ B0 |
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 . ⇠ø⇠◔ A1 |
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 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
262 setup |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
263 ----- |
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 $ mktestrepo prune |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
266 $ mkcommit 'C-A0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
267 $ mkcommit 'C-B0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
268 $ 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
|
269 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
|
270 $ mkcommit 'C-A1' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
271 created new head |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
272 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
273 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
274 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
275 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
|
276 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
277 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
|
278 $ 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
|
279 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
|
280 $ 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
|
281 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
|
282 | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
283 | 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
|
284 | | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
285 | 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
|
286 |/ |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
287 @ ea207398892e: ROOT |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
288 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
289 $ hg debugobsolete |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
290 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
|
291 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
|
292 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
|
293 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
294 Actual testing |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
295 -------------- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
296 |
32598
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
297 $ 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
|
298 ### 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
|
299 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
|
300 ### 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
|
301 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
|
302 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
|
303 # 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
|
304 ### 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
|
305 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
|
306 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
|
307 ### 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
|
308 ################################# |
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
|
309 ### 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
|
310 |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
311 (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
|
312 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
|
313 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
|
314 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
|
315 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
316 $ 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
|
317 ### 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
|
318 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
|
319 ### 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
|
320 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
|
321 # 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
|
322 ### 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
|
323 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
|
324 ### 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
|
325 ################################# |
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
|
326 ### 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
|
327 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
|
328 # 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
|
329 ### 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
|
330 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
|
331 ### 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
|
332 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
333 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
334 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
|
335 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
336 ################################# |
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 # 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
|
338 # 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
|
339 # 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
|
340 # 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
|
341 # unbundling: 1 new obsolescence markers |
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
|
342 # 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
|
343 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
344 $ 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
|
345 ### 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
|
346 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
|
347 ### 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
|
348 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
|
349 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
|
350 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
|
351 # 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
|
352 ### 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
|
353 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
|
354 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
|
355 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
|
356 ### 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
|
357 ################################# |
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
|
358 ### 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
|
359 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
|
360 # 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
|
361 ### 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
|
362 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
|
363 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
|
364 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
|
365 ### 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
|
366 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
367 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
368 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
|
369 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
370 ################################# |
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
|
371 # 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
|
372 # 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
|
373 # 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
|
374 # 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
|
375 # 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
|
376 # unbundling: obsoleted 1 changesets |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
377 # unbundling: new changesets cf2c22470d67 |
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
|
378 # 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
|
379 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
380 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
|
381 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
382 $ 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
|
383 ### 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
|
384 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
|
385 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
|
386 ### 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
|
387 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
|
388 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
|
389 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
|
390 # 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
|
391 ### 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
|
392 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
|
393 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
|
394 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
|
395 ### 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
|
396 ################################# |
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
|
397 ### 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
|
398 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
|
399 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
|
400 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
401 $ 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
|
402 ### 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
|
403 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
|
404 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
|
405 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
|
406 ### 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
|
407 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
|
408 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
|
409 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
|
410 # 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
|
411 ### 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
|
412 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
|
413 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
|
414 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
|
415 ### 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
|
416 ################################# |
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
|
417 ### 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
|
418 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
|
419 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
|
420 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
|
421 # 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
|
422 ### 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
|
423 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
|
424 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
|
425 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
|
426 ### 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
|
427 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
428 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
429 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
|
430 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
|
431 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
|
432 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
433 ################################# |
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
|
434 # 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
|
435 # 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
|
436 # 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
|
437 # 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
|
438 # unbundling: 3 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
439 # unbundling: new changesets cf2c22470d67 |
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
|
440 # 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
|
441 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
442 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
|
443 ================================= |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
444 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
445 . A0 (also pruned) |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
446 . ⇠ø⇠◔ A1 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
447 . | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
448 . ● |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
449 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
450 setup |
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 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
453 $ mktestrepo prune-inline |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
454 $ mkcommit 'C-A0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
455 $ 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
|
456 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
|
457 $ mkcommit 'C-A1' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
458 created new head |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
459 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
460 $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
461 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
|
462 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
463 $ 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
|
464 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
|
465 $ 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
|
466 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
|
467 | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
468 | 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
|
469 |/ |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
470 @ ea207398892e: ROOT |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
471 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
472 $ hg debugobsolete |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
473 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
|
474 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
|
475 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
|
476 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
477 Actual testing |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
478 -------------- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
479 |
32599
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
480 $ 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
|
481 ### 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
|
482 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
|
483 ### 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
|
484 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
|
485 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
|
486 # 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
|
487 ### 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
|
488 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
|
489 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
|
490 ### 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
|
491 ################################# |
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
|
492 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
493 # 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
|
494 ### 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
|
495 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
|
496 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
|
497 ### 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
|
498 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
499 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
500 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
501 ################################# |
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
|
502 # 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
|
503 # 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
|
504 # 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
|
505 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
506 # 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
|
507 |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
508 $ 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
|
509 ### 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
|
510 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
|
511 ### 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
|
512 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
|
513 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
|
514 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
|
515 # 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
|
516 ### 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
|
517 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
|
518 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
|
519 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
|
520 ### 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
|
521 ################################# |
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
|
522 ### 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
|
523 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
|
524 # 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
|
525 ### 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
|
526 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
|
527 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
|
528 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
|
529 ### 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
|
530 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
531 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
532 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
|
533 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
534 ################################# |
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
|
535 # 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
|
536 # 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
|
537 # 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
|
538 # 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
|
539 # unbundling: 1 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
540 # unbundling: new changesets cf2c22470d67 |
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
|
541 # 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
|
542 |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
543 $ 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
|
544 ### 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
|
545 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
|
546 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
|
547 ### 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
|
548 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
|
549 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
|
550 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
|
551 # 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
|
552 ### 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
|
553 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
|
554 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
|
555 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
|
556 ### 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
|
557 ################################# |
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
|
558 ### 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
|
559 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
|
560 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
|
561 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
|
562 # 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
|
563 ### 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
|
564 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
|
565 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
|
566 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
|
567 ### 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
|
568 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
569 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
570 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
|
571 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
|
572 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
|
573 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
574 ################################# |
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
|
575 # 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
|
576 # 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
|
577 # 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
|
578 # 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
|
579 # unbundling: 3 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
580 # unbundling: new changesets cf2c22470d67 |
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
|
581 # 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
|
582 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
583 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
|
584 ======================== |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
585 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
586 . ⊗ 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
|
587 . | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
588 . ⇠◌⇠◔ 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
|
589 . | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
590 . ● |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
591 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
592 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
|
593 ----- |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
594 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
595 $ 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
|
596 $ 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
|
597 $ 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
|
598 $ 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
|
599 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
|
600 $ 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
|
601 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
|
602 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("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
|
603 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
604 obsoleted 1 changesets |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
605 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
|
606 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
607 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
|
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 (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
|
610 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
611 $ 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
|
612 |
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, 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
|
615 $ 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
|
616 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
|
617 | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
618 @ 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
|
619 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
620 $ 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
|
621 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
|
622 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
|
623 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
|
624 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
625 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
|
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 |
32600
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
628 $ 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
|
629 ### 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
|
630 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
|
631 ### 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
|
632 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
|
633 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
|
634 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
|
635 # 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
|
636 ### 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
|
637 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
|
638 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
|
639 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
|
640 ### 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
|
641 ################################# |
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
|
642 ### 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
|
643 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
|
644 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
|
645 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
|
646 # 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
|
647 ### 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
|
648 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
|
649 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
|
650 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
|
651 ### 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
|
652 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
653 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
654 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
|
655 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
|
656 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
|
657 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
658 ################################# |
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
|
659 # 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
|
660 # 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
|
661 # 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
|
662 # 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
|
663 # unbundling: 3 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
664 # unbundling: new changesets cf2c22470d67 |
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 # 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
|
666 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
667 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
|
668 ================================= |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
669 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
670 . 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
|
671 . ⇠◌⇠◔ 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
|
672 . | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
673 . ● |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
674 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
675 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
|
676 ----- |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
677 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
678 $ 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
|
679 $ 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
|
680 $ 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
|
681 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
|
682 $ 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
|
683 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
|
684 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("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
|
685 $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
686 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
|
687 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("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
|
688 |
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 (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
|
690 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
691 $ 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
|
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 $ 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
|
694 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
|
695 $ 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
|
696 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
|
697 | |
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 @ 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
|
699 |
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 $ 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
|
701 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
|
702 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
|
703 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
|
704 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
705 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
|
706 -------------- |
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 |
32601
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
708 $ 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
|
709 ### 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
|
710 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
|
711 ### 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
|
712 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
|
713 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
|
714 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
|
715 # 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
|
716 ### 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
|
717 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
|
718 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
|
719 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
|
720 ### 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
|
721 ################################# |
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
|
722 ### 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
|
723 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
|
724 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
|
725 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
|
726 # 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
|
727 ### 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
|
728 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
|
729 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
|
730 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
|
731 ### 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
|
732 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
733 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
734 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
|
735 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
|
736 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
|
737 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
738 ################################# |
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
|
739 # 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
|
740 # 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
|
741 # 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
|
742 # 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
|
743 # unbundling: 3 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
744 # unbundling: new changesets cf2c22470d67 |
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
|
745 # 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
|
746 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
747 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
|
748 ========================= |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
749 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
750 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
|
751 ----- |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
752 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
753 $ 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
|
754 $ 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
|
755 $ 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
|
756 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
|
757 $ 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
|
758 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
|
759 $ 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
|
760 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
|
761 $ 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
|
762 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
|
763 $ 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
|
764 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
|
765 $ 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
|
766 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
|
767 $ 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
|
768 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
|
769 $ 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
|
770 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
|
771 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("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
|
772 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
773 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
|
774 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
775 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
|
776 $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 |
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 $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` |
35709
1a09dad8b85a
evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
35393
diff
changeset
|
778 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
|
779 $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
780 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
|
781 $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
782 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
|
783 $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
784 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
|
785 $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("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
|
786 |
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 $ 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
|
788 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
|
789 $ 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
|
790 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
|
791 | |
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 | 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
|
793 |/ |
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 | 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
|
795 |/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
796 | 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
|
797 |/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
798 | 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
|
799 |/ |
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 @ 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
|
801 |
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 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
803 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
|
804 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
|
805 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
|
806 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
|
807 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
|
808 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
|
809 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
|
810 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
|
811 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
|
812 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
813 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
|
814 -------------- |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
815 |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
816 $ 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
|
817 ### 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
|
818 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
|
819 ### 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
|
820 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
|
821 # 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
|
822 ### 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
|
823 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
|
824 ### 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
|
825 ################################# |
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
|
826 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
827 # 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
|
828 ### 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
|
829 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
|
830 ### 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
|
831 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
832 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
833 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
834 ################################# |
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
|
835 # 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
|
836 # 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
|
837 # 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
|
838 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
839 # 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
|
840 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
841 $ 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
|
842 ### 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
|
843 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
|
844 ### 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
|
845 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
|
846 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
|
847 # 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
|
848 ### 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
|
849 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
|
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 ### 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
|
852 ################################# |
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
|
853 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
854 # 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
|
855 ### 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
|
856 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
|
857 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
|
858 ### 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
|
859 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
860 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
861 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
862 ################################# |
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
|
863 # 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
|
864 # 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
|
865 # 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
|
866 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
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: (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
|
868 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
869 $ 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
|
870 ### 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
|
871 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
|
872 ### 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
|
873 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
|
874 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
|
875 # 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
|
876 ### 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
|
877 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
|
878 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
|
879 ### 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
|
880 ################################# |
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
|
881 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
882 # 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
|
883 ### 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
|
884 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
|
885 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
|
886 ### 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
|
887 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
888 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
889 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
890 ################################# |
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
|
891 # 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
|
892 # 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
|
893 # 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
|
894 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
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: (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
|
896 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
897 $ 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
|
898 ### 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
|
899 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
|
900 ### 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
|
901 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
|
902 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
|
903 # 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
|
904 ### 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
|
905 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
|
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 ### 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
|
908 ################################# |
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
|
909 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
910 # 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
|
911 ### 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
|
912 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
|
913 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
|
914 ### 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
|
915 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
916 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
917 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
918 ################################# |
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
|
919 # 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
|
920 # 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
|
921 # 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
|
922 # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
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: (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
|
924 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
925 $ 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
|
926 ### 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
|
927 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
|
928 ### 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
|
929 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
|
930 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
|
931 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
|
932 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
|
933 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
|
934 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
|
935 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
|
936 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
|
937 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
|
938 # 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
|
939 ### 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
|
940 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
|
941 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
|
942 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
|
943 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
|
944 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
|
945 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
|
946 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
|
947 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
|
948 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
|
949 ### 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
|
950 ################################# |
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
|
951 ### 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
|
952 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
|
953 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
|
954 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
|
955 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
|
956 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
|
957 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
|
958 # 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
|
959 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
|
960 ### 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
|
961 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
|
962 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
|
963 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
|
964 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
|
965 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
|
966 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
|
967 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
|
968 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
|
969 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
|
970 ### 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
|
971 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
972 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
973 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
|
974 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
|
975 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
|
976 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
|
977 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
|
978 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
|
979 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
980 ################################# |
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
|
981 # 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
|
982 # 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
|
983 # 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
|
984 # 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
|
985 # 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
|
986 # unbundling: obsoleted 3 changesets |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
987 # unbundling: new changesets 2f20ff6509f0 |
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
|
988 # 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
|
989 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
990 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
|
991 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
992 * 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
|
993 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
994 $ 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
|
995 ### 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
|
996 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
|
997 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
|
998 ### 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
|
999 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
|
1000 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
|
1001 # 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
|
1002 ### 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
|
1003 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
|
1004 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
|
1005 ### 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
|
1006 ################################# |
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
|
1007 ### Exclusive markers ### |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34869
diff
changeset
|
1008 # 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
|
1009 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1010 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
|
1011 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
|
1012 ### 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
|
1013 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1014 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1015 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1016 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1017 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1018 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1019 # 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
|
1020 # 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
|
1021 # 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
|
1022 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1023 * 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
|
1024 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1025 $ 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
|
1026 ### 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
|
1027 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
|
1028 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
|
1029 ### 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
|
1030 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
|
1031 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
|
1032 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
|
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 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
|
1035 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
|
1036 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
|
1037 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
|
1038 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
|
1039 # 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
|
1040 ### 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
|
1041 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
|
1042 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
|
1043 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
|
1044 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
|
1045 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
|
1046 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
|
1047 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
|
1048 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
|
1049 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
|
1050 ### 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
|
1051 ################################# |
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
|
1052 ### 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
|
1053 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
|
1054 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
|
1055 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
|
1056 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
|
1057 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
|
1058 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
|
1059 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
|
1060 # 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
|
1061 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1062 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
|
1063 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
|
1064 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
|
1065 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
|
1066 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
|
1067 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
|
1068 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
|
1069 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
|
1070 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
|
1071 ### 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
|
1072 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1073 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1074 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
|
1075 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
|
1076 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
|
1077 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
|
1078 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
|
1079 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
|
1080 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
|
1081 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1082 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1083 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1084 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1085 # 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
|
1086 # 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
|
1087 # 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
|
1088 # unbundling: obsoleted 2 changesets |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
1089 # unbundling: new changesets 2f20ff6509f0 |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1090 # 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
|
1091 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1092 * 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
|
1093 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1094 $ 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
|
1095 ### 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
|
1096 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
|
1097 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
|
1098 ### 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
|
1099 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
|
1100 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
|
1101 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
|
1102 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
|
1103 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
|
1104 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
|
1105 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
|
1106 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
|
1107 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
|
1108 # 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
|
1109 ### 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
|
1110 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
|
1111 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
|
1112 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
|
1113 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
|
1114 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
|
1115 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
|
1116 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
|
1117 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
|
1118 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
|
1119 ### 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
|
1120 ################################# |
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
|
1121 ### 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
|
1122 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
|
1123 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
|
1124 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
|
1125 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
|
1126 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
|
1127 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
|
1128 # 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
|
1129 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
|
1130 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1131 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
|
1132 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
|
1133 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
|
1134 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
|
1135 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
|
1136 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
|
1137 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
|
1138 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
|
1139 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
|
1140 ### 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
|
1141 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1142 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1143 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
|
1144 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
|
1145 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
|
1146 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
|
1147 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
|
1148 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
|
1149 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1150 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1151 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1152 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1153 # 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
|
1154 # 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
|
1155 # 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
|
1156 # unbundling: obsoleted 3 changesets |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
1157 # unbundling: new changesets 2f20ff6509f0 |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1158 # 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
|
1159 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1160 * 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
|
1161 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1162 $ 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
|
1163 ### 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
|
1164 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
|
1165 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
|
1166 ### 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
|
1167 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
|
1168 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
|
1169 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
|
1170 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
|
1171 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
|
1172 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
|
1173 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
|
1174 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
|
1175 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
|
1176 # 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
|
1177 ### 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
|
1178 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
|
1179 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
|
1180 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
|
1181 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
|
1182 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
|
1183 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
|
1184 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
|
1185 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
|
1186 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
|
1187 ### 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
|
1188 ################################# |
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
|
1189 ### 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
|
1190 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
|
1191 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
|
1192 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
|
1193 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
|
1194 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
|
1195 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
|
1196 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
|
1197 # 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
|
1198 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1199 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
|
1200 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
|
1201 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
|
1202 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
|
1203 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
|
1204 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
|
1205 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
|
1206 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
|
1207 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
|
1208 ### 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
|
1209 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1210 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1211 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
|
1212 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
|
1213 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
|
1214 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
|
1215 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
|
1216 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
|
1217 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
|
1218 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1219 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1220 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1221 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1222 # 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
|
1223 # 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
|
1224 # 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
|
1225 # unbundling: obsoleted 2 changesets |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
1226 # unbundling: new changesets 2f20ff6509f0 |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1227 # 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
|
1228 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1229 * all |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1230 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1231 $ 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
|
1232 ### 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
|
1233 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
|
1234 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
|
1235 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
|
1236 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
|
1237 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
|
1238 ### 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
|
1239 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
|
1240 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
|
1241 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
|
1242 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
|
1243 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
|
1244 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
|
1245 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
|
1246 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
|
1247 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
|
1248 # 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
|
1249 ### 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
|
1250 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
|
1251 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
|
1252 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
|
1253 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
|
1254 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
|
1255 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
|
1256 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
|
1257 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
|
1258 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
|
1259 ### 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
|
1260 ################################# |
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
|
1261 ### 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
|
1262 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
|
1263 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
|
1264 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
|
1265 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
|
1266 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
|
1267 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
|
1268 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
|
1269 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
|
1270 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
|
1271 # 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
|
1272 ### 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
|
1273 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
|
1274 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
|
1275 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
|
1276 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
|
1277 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
|
1278 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
|
1279 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
|
1280 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
|
1281 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
|
1282 ### 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
|
1283 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1284 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1285 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
|
1286 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
|
1287 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
|
1288 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
|
1289 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
|
1290 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
|
1291 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
|
1292 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
|
1293 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
|
1294 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1295 ################################# |
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
|
1296 # 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
|
1297 # 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
|
1298 # 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
|
1299 # 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
|
1300 # unbundling: 9 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
1301 # unbundling: new changesets 2f20ff6509f0 |
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
|
1302 # 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
|
1303 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1304 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
|
1305 =========================== |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1306 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1307 . ⊗ 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
|
1308 . | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1309 . ◕ 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
|
1310 . | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1311 . ● |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1312 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1313 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
|
1314 ----- |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1315 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1316 $ 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
|
1317 $ 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
|
1318 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
|
1319 $ 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
|
1320 $ 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
|
1321 $ hg debugobsolete --record-parent `getid 'desc("C-B")'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
33252
diff
changeset
|
1322 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
|
1323 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1324 $ 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
|
1325 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
|
1326 $ 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
|
1327 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
|
1328 | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1329 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
|
1330 | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1331 @ 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
|
1332 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1333 $ 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
|
1334 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
|
1335 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1336 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
|
1337 -------------- |
32603
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1338 $ 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
|
1339 ### 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
|
1340 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
|
1341 ### 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
|
1342 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
|
1343 # 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
|
1344 ### 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
|
1345 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
|
1346 ### 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
|
1347 ################################# |
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
|
1348 ### 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
|
1349 $ 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
|
1350 ### 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
|
1351 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
|
1352 ### 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
|
1353 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
|
1354 # 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
|
1355 ### 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
|
1356 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
|
1357 ### 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
|
1358 ################################# |
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
|
1359 ### 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
|
1360 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
|
1361 # 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
|
1362 ### 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
|
1363 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
|
1364 ### 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
|
1365 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1366 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1367 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
|
1368 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1369 ################################# |
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
|
1370 # 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
|
1371 # 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
|
1372 # 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
|
1373 # 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
|
1374 # unbundling: 1 new obsolescence markers |
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
|
1375 # 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
|
1376 $ 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
|
1377 ### 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
|
1378 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
|
1379 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
|
1380 ### 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
|
1381 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
|
1382 # 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
|
1383 ### 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
|
1384 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
|
1385 ### 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
|
1386 ################################# |
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
|
1387 ### 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
|
1388 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
|
1389 # 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
|
1390 ### 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
|
1391 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
|
1392 ### 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
|
1393 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1394 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1395 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
|
1396 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1397 ################################# |
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
|
1398 # 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
|
1399 # 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
|
1400 # 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
|
1401 # 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
|
1402 # unbundling: 1 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33773
diff
changeset
|
1403 # unbundling: new changesets 9ac430e15fca |
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
|
1404 # unbundling: (run 'hg update' to get a working copy) |