Mercurial > hg
annotate tests/test-obsolete-bundle-strip.t @ 34107:4f60720cf0df
blackbox: fix rotation with chg
The added test will show:
$ $PYTHON showsize.py .hg/blackbox*
.hg/blackbox.log: < 500
.hg/blackbox.log.1: < 500
.hg/blackbox.log.2: < 500
.hg/blackbox.log.3: < 500
.hg/blackbox.log.4: < 500
.hg/blackbox.log.5: >= 500
with previous code.
The issue is caused by blackbox caching file objects *by path*, and the
rotation size check could run on a wrong file object (i.e. it should check
"blackbox.log", but `filehandles["blackbox.log"]` contains a file object
that has been renamed to "blackbox.log.5").
This patch removes the "filehandlers" global cache added by 45313f5a3a8c to
solve the issue.
I think the original patch was trying to make different ui objects use a same
file object if their blackbox.log path is the same. In theory it could also
be problematic in the rotation case. Anyway, that should become unnecessary
after D650.
Differential Revision: https://phab.mercurial-scm.org/D648
author | Jun Wu <quark@fb.com> |
---|---|
date | Wed, 06 Sep 2017 19:27:30 -0700 |
parents | 6c1a9fd8361b |
children | eb586ed5d8ce |
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 |
33773
6c1a9fd8361b
test: update evolution config
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
18 > stabilization = all |
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 |
33773
6c1a9fd8361b
test: update evolution config
Boris Feld <boris.feld@octobus.net>
parents:
33542
diff
changeset
|
21 > stabilization.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 ### |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
161 # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg (glob) |
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'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
192 # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) |
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 |
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
|
210 # 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
|
211 |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
212 $ 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
|
213 ### 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
|
214 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
|
215 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
|
216 ### 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
|
217 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
|
218 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
|
219 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
|
220 # 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
|
221 ### 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
|
222 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
223 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
224 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
9df4c2613fca
test-obsolete-bundle-strip: test bundling in the first case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32491
diff
changeset
|
225 ### 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
|
226 ################################# |
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
|
227 ### 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
|
228 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
|
229 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
|
230 a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
231 # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg (glob) |
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
|
232 ### 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
|
233 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
|
234 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
|
235 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
|
236 ### 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
|
237 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
238 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
239 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
|
240 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
|
241 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
|
242 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
243 ################################# |
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
|
244 # 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
|
245 # 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
|
246 # 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
|
247 # 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
|
248 # unbundling: 3 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
|
249 # 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
|
250 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
251 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
|
252 ========================= |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
253 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
254 . ⇠⊗ B0 |
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 . ⇠ø⇠◔ A1 |
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 . ● |
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 setup |
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 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
263 $ mktestrepo prune |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
264 $ mkcommit 'C-A0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
265 $ mkcommit 'C-B0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
266 $ 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
|
267 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
|
268 $ mkcommit 'C-A1' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
269 created new head |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
270 $ 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
|
271 $ 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
|
272 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
|
273 $ 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
|
274 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
|
275 $ 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
|
276 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
|
277 $ 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
|
278 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
|
279 | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
280 | 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
|
281 | | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
282 | 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
|
283 |/ |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
284 @ ea207398892e: ROOT |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
285 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
286 $ hg debugobsolete |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
287 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
|
288 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
|
289 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
|
290 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
291 Actual testing |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
292 -------------- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
293 |
32598
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
294 $ 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
|
295 ### 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
|
296 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
|
297 ### 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
|
298 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
|
299 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
|
300 # 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
|
301 ### 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
|
302 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
|
303 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
|
304 ### 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
|
305 ################################# |
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
|
306 ### 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
|
307 |
b36b02d57021
exclusive-markers: update the dedicated test with list of exclusive markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32625
diff
changeset
|
308 (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
|
309 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
|
310 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
|
311 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
|
312 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
313 $ 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
|
314 ### 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
|
315 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
|
316 ### 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
|
317 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
|
318 # 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
|
319 ### 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
|
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 ### 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
|
322 ################################# |
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
|
323 ### 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
|
324 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
325 # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/29f93b1df87b-7fb32101-backup.hg (glob) |
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
|
326 ### 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
|
327 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
|
328 ### 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
|
329 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
330 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
331 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
|
332 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
333 ################################# |
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
|
334 # 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
|
335 # 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
|
336 # 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
|
337 # 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
|
338 # 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
|
339 # 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
|
340 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
341 $ 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
|
342 ### 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
|
343 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
|
344 ### 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
|
345 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
|
346 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
|
347 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
|
348 # 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
|
349 ### 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
|
350 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
|
351 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
|
352 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
|
353 ### 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
|
354 ################################# |
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
|
355 ### 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
|
356 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
357 # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) |
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
|
358 ### 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
|
359 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
|
360 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
|
361 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
|
362 ### 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
|
363 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
364 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
365 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
|
366 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
367 ################################# |
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
|
368 # 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
|
369 # 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
|
370 # 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
|
371 # 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
|
372 # 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
|
373 # unbundling: obsoleted 1 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
|
374 # 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
|
375 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
376 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
|
377 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
378 $ 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
|
379 ### 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
|
380 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
|
381 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
|
382 ### 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
|
383 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
|
384 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
|
385 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
|
386 # 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
|
387 ### 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
|
388 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
|
389 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
|
390 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
|
391 ### 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
|
392 ################################# |
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
|
393 ### 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
|
394 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
|
395 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
|
396 |
2c817cfe9cf5
test-obsolete-bundle-strip: test bundling in the second case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32597
diff
changeset
|
397 $ 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
|
398 ### 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
|
399 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
|
400 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
|
401 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
|
402 ### 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
|
403 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
|
404 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
|
405 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
|
406 # 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
|
407 ### 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
|
408 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
|
409 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
|
410 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
|
411 ### 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
|
412 ################################# |
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
|
413 ### 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
|
414 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
|
415 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
|
416 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
417 # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-884c33b0-backup.hg (glob) |
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
|
418 ### 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
|
419 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
|
420 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
|
421 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
|
422 ### 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
|
423 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
424 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
425 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
|
426 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
|
427 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
|
428 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
429 ################################# |
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
|
430 # 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
|
431 # 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
|
432 # 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
|
433 # 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
|
434 # unbundling: 3 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
|
435 # 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
|
436 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
437 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
|
438 ================================= |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
439 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
440 . A0 (also pruned) |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
441 . ⇠ø⇠◔ A1 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
442 . | |
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 setup |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
446 ----- |
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 $ mktestrepo prune-inline |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
449 $ mkcommit 'C-A0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
450 $ 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
|
451 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
|
452 $ mkcommit 'C-A1' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
453 created new head |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
454 $ 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
|
455 $ 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
|
456 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
|
457 $ 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
|
458 $ 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
|
459 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
|
460 $ 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
|
461 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
|
462 | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
463 | 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
|
464 |/ |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
465 @ ea207398892e: ROOT |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
466 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
467 $ hg debugobsolete |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
468 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
|
469 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
|
470 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
|
471 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
472 Actual testing |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
473 -------------- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
474 |
32599
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
475 $ 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
|
476 ### 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
|
477 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
|
478 ### 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
|
479 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
|
480 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
|
481 # 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
|
482 ### 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
|
483 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
|
484 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
|
485 ### 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
|
486 ################################# |
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
|
487 ### Exclusive markers ### |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
488 # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg (glob) |
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
|
489 ### 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
|
490 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
|
491 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
|
492 ### 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
|
493 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
494 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
495 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
496 ################################# |
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
|
497 # 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
|
498 # 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
|
499 # 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
|
500 # 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
|
501 # 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
|
502 |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
503 $ 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
|
504 ### 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
|
505 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
|
506 ### 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
|
507 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
|
508 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
|
509 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
|
510 # 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
|
511 ### 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
|
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 ### 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
|
516 ################################# |
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
|
517 ### 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
|
518 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
519 # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
520 ### 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
|
521 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
|
522 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
|
523 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
|
524 ### 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
|
525 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
526 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
527 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
|
528 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
529 ################################# |
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
|
530 # 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
|
531 # 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
|
532 # 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
|
533 # 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
|
534 # 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
|
535 # 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
|
536 |
d10aee513f28
test-obsolete-bundle-strip: test bundling in the third case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32598
diff
changeset
|
537 $ 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
|
538 ### 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
|
539 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
|
540 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
|
541 ### 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
|
542 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
|
543 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
|
544 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
|
545 # 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
|
546 ### 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
|
547 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
|
548 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
|
549 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
|
550 ### 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
|
551 ################################# |
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
|
552 ### 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
|
553 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
|
554 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
|
555 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
556 # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg (glob) |
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
|
557 ### 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
|
558 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
|
559 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
|
560 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
|
561 ### 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
|
562 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
563 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
564 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
|
565 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
|
566 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
|
567 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
568 ################################# |
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
|
569 # 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
|
570 # 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
|
571 # 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
|
572 # 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
|
573 # unbundling: 3 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
|
574 # 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
|
575 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
576 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
|
577 ======================== |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
578 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
579 . ⊗ 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
|
580 . | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
581 . ⇠◌⇠◔ 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
|
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 . ● |
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 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
|
586 ----- |
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 $ 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
|
589 $ 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
|
590 $ 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
|
591 $ 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
|
592 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
|
593 $ 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
|
594 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
|
595 $ 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
|
596 $ 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
|
597 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
|
598 $ 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
|
599 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
|
600 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
601 (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
|
602 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
603 $ 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
|
604 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
605 $ 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
|
606 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
|
607 $ 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
|
608 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
|
609 | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
610 @ 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
|
611 |
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 $ 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
|
613 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
|
614 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
|
615 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
|
616 |
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 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
|
618 -------------- |
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 |
32600
741017ba76ae
test-obsolete-bundle-strip: test bundling in the fourth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32599
diff
changeset
|
620 $ 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
|
621 ### 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
|
622 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
|
623 ### 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
|
624 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
|
625 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
|
626 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
|
627 # 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
|
628 ### 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
|
629 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
|
630 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
|
631 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
|
632 ### 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
|
633 ################################# |
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
|
634 ### 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
|
635 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
|
636 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
|
637 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
638 # stripping: saved backup bundle to $TESTTMP/missing-prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) |
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
|
639 ### 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
|
640 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
|
641 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
|
642 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
|
643 ### 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
|
644 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
645 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
646 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
|
647 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
|
648 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
|
649 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
650 ################################# |
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
|
651 # 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
|
652 # 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
|
653 # 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
|
654 # 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
|
655 # unbundling: 3 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
|
656 # 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
|
657 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
658 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
|
659 ================================= |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
660 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
661 . 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
|
662 . ⇠◌⇠◔ 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
|
663 . | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
664 . ● |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
665 |
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 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
|
667 ----- |
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 $ 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
|
670 $ 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
|
671 $ 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
|
672 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
|
673 $ 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
|
674 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
|
675 $ 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
|
676 $ 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
|
677 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
|
678 $ 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
|
679 |
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 (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
|
681 |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
682 $ 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
|
683 |
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 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
|
685 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
|
686 $ 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
|
687 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
|
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 @ 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
|
690 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
691 $ 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
|
692 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
|
693 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
|
694 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
|
695 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
696 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
|
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 |
32601
401bf3f0f76c
test-obsolete-bundle-strip: test bundling in the fifth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32600
diff
changeset
|
699 $ 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
|
700 ### 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
|
701 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
|
702 ### 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
|
703 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
|
704 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
|
705 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
|
706 # 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
|
707 ### 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
|
708 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
|
709 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
|
710 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
|
711 ### 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
|
712 ################################# |
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
|
713 ### 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
|
714 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
|
715 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
|
716 a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
717 # stripping: saved backup bundle to $TESTTMP/prune-inline-missing/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) |
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
|
718 ### 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
|
719 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
|
720 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
|
721 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
|
722 ### 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
|
723 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
724 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
725 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
|
726 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
|
727 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
|
728 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
729 ################################# |
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
|
730 # 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
|
731 # 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
|
732 # 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
|
733 # 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
|
734 # unbundling: 3 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
|
735 # 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
|
736 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
737 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
|
738 ========================= |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
739 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
740 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
|
741 ----- |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
742 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
743 $ 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
|
744 $ 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
|
745 $ 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
|
746 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
|
747 $ 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
|
748 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
|
749 $ 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
|
750 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
|
751 $ 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
|
752 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
|
753 $ 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
|
754 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
|
755 $ 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
|
756 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
|
757 $ 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
|
758 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
|
759 $ 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
|
760 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
|
761 $ 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
|
762 $ 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
|
763 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
|
764 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
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 $ 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
|
766 $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `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
|
767 $ 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
|
768 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
|
769 $ 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
|
770 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
|
771 $ 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
|
772 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
|
773 $ 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
|
774 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
775 $ 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
|
776 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
|
777 $ 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
|
778 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
|
779 | |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
780 | 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
|
781 |/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
782 | 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
|
783 |/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
784 | 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
|
785 |/ |
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 | 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
|
787 |/ |
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 @ 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
|
789 |
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 $ 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
|
791 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
|
792 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
|
793 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
|
794 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
|
795 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
|
796 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
|
797 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
|
798 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
|
799 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
|
800 |
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 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
|
802 -------------- |
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 |
32602
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
804 $ 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
|
805 ### 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
|
806 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
|
807 ### 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
|
808 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
|
809 # 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
|
810 ### 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
|
811 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
|
812 ### 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
|
813 ################################# |
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
|
814 ### Exclusive markers ### |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
815 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-81204eba-backup.hg (glob) |
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
|
816 ### 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
|
817 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
|
818 ### 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
|
819 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
820 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
821 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
822 ################################# |
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
|
823 # 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
|
824 # 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
|
825 # 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
|
826 # 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
|
827 # 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
|
828 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
829 $ 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
|
830 ### 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
|
831 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
|
832 ### 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
|
833 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
|
834 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
|
835 # 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
|
836 ### 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
|
837 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
|
838 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
|
839 ### 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
|
840 ################################# |
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
|
841 ### Exclusive markers ### |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
842 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-7465d6e9-backup.hg (glob) |
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
|
843 ### 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
|
844 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
|
845 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
|
846 ### 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
|
847 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
848 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
849 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
850 ################################# |
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
|
851 # 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
|
852 # 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
|
853 # 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
|
854 # 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
|
855 # 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
|
856 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
857 $ 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
|
858 ### 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
|
859 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
|
860 ### 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
|
861 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
|
862 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
|
863 # 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
|
864 ### 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
|
865 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
|
866 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
|
867 ### 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
|
868 ################################# |
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
|
869 ### Exclusive markers ### |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
870 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/27ec657ca21d-d5dd1c7c-backup.hg (glob) |
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
|
871 ### 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
|
872 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
|
873 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
|
874 ### 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
|
875 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
876 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
877 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
878 ################################# |
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
|
879 # 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
|
880 # 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
|
881 # 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
|
882 # 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
|
883 # 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
|
884 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
885 $ 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
|
886 ### 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
|
887 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
|
888 ### 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
|
889 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
|
890 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
|
891 # 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
|
892 ### 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
|
893 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
|
894 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
|
895 ### 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
|
896 ################################# |
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
|
897 ### Exclusive markers ### |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
898 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/06dc9da25ef0-9b1c0a91-backup.hg (glob) |
32624
dd76646ed799
test-obsolete-bundle-strip: add testing of markers backup during strip
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32603
diff
changeset
|
899 ### 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
|
900 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
|
901 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
|
902 ### 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
|
903 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
904 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
905 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
906 ################################# |
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
|
907 # 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
|
908 # 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
|
909 # 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
|
910 # 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
|
911 # 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
|
912 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
913 $ 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
|
914 ### 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
|
915 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
|
916 ### 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
|
917 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
|
918 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
|
919 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
|
920 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
|
921 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
|
922 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
|
923 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
|
924 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
|
925 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
|
926 # 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
|
927 ### 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
|
928 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
|
929 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
|
930 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
|
931 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
|
932 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
|
933 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
|
934 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
|
935 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
|
936 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
|
937 ### 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
|
938 ################################# |
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
|
939 ### 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
|
940 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
|
941 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
|
942 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
|
943 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
|
944 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
|
945 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
946 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg (glob) |
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
|
947 ### 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
|
948 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
|
949 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
|
950 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
|
951 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
|
952 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
|
953 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
|
954 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
|
955 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
|
956 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
|
957 ### 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
|
958 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
959 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
960 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
|
961 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
|
962 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
|
963 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
|
964 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
|
965 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
|
966 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
967 ################################# |
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
|
968 # 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
|
969 # 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
|
970 # 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
|
971 # 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
|
972 # 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
|
973 # unbundling: obsoleted 3 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
|
974 # 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
|
975 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
976 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
|
977 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
978 * 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
|
979 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
980 $ 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
|
981 ### 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
|
982 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
|
983 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
|
984 ### 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
|
985 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
|
986 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
|
987 # 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
|
988 ### 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
|
989 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
|
990 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
|
991 ### 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
|
992 ################################# |
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
|
993 ### Exclusive markers ### |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
994 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-0daf625a-backup.hg (glob) |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
995 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
996 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
|
997 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
|
998 ### 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
|
999 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1000 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1001 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1002 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1003 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1004 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1005 # 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
|
1006 # 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
|
1007 # 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
|
1008 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1009 * 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
|
1010 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1011 $ 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
|
1012 ### 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
|
1013 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
|
1014 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
|
1015 ### 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
|
1016 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
|
1017 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
|
1018 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
|
1019 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
|
1020 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
|
1021 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
|
1022 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
|
1023 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
|
1024 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
|
1025 # 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
|
1026 ### 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
|
1027 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
|
1028 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
|
1029 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
|
1030 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
|
1031 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
|
1032 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
|
1033 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
|
1034 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
|
1035 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
|
1036 ### 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
|
1037 ################################# |
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
|
1038 ### 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
|
1039 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
|
1040 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
|
1041 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
|
1042 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
|
1043 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
|
1044 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
|
1045 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
1046 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-bf1b80f4-backup.hg (glob) |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1047 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1048 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
|
1049 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
|
1050 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
|
1051 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
|
1052 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
|
1053 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
|
1054 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
|
1055 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
|
1056 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
|
1057 ### 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
|
1058 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1059 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1060 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
|
1061 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
|
1062 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
|
1063 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
|
1064 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
|
1065 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
|
1066 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
|
1067 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1068 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1069 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1070 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1071 # 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
|
1072 # 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
|
1073 # 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
|
1074 # unbundling: obsoleted 2 changesets |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1075 # 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
|
1076 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1077 * 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
|
1078 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1079 $ 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
|
1080 ### 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
|
1081 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
|
1082 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
|
1083 ### 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
|
1084 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
|
1085 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
|
1086 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
|
1087 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
|
1088 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
|
1089 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
|
1090 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
|
1091 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
|
1092 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
|
1093 # 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
|
1094 ### 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
|
1095 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
|
1096 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
|
1097 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
|
1098 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
|
1099 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
|
1100 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
|
1101 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
|
1102 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
|
1103 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
|
1104 ### 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
|
1105 ################################# |
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
|
1106 ### 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
|
1107 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
|
1108 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
|
1109 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
|
1110 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
|
1111 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
|
1112 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
1113 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg (glob) |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1114 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1115 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
|
1116 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
|
1117 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
|
1118 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
|
1119 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
|
1120 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
|
1121 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
|
1122 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
|
1123 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
|
1124 ### 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
|
1125 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1126 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1127 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
|
1128 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
|
1129 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
|
1130 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
|
1131 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
|
1132 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
|
1133 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1134 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1135 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1136 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1137 # 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
|
1138 # 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
|
1139 # 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
|
1140 # unbundling: obsoleted 3 changesets |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1141 # 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
|
1142 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1143 * 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
|
1144 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1145 $ 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
|
1146 ### 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
|
1147 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
|
1148 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
|
1149 ### 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
|
1150 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
|
1151 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
|
1152 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
|
1153 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
|
1154 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
|
1155 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
|
1156 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
|
1157 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
|
1158 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
|
1159 # 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
|
1160 ### 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
|
1161 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
|
1162 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
|
1163 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
|
1164 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
|
1165 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
|
1166 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
|
1167 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
|
1168 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
|
1169 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
|
1170 ### 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
|
1171 ################################# |
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
|
1172 ### 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
|
1173 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
|
1174 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
|
1175 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
|
1176 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
|
1177 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
|
1178 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
|
1179 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
1180 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-5fdfcd7d-backup.hg (glob) |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1181 ### Backup markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1182 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
|
1183 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
|
1184 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
|
1185 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
|
1186 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
|
1187 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
|
1188 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
|
1189 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
|
1190 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
|
1191 ### 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
|
1192 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1193 ### Stripped markers ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1194 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
|
1195 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
|
1196 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
|
1197 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
|
1198 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
|
1199 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
|
1200 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
|
1201 ### diff <exclusive> <stripped> ### |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1202 ################################# |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1203 # unbundling: adding changesets |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1204 # unbundling: adding manifests |
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1205 # 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
|
1206 # 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
|
1207 # 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
|
1208 # unbundling: obsoleted 2 changesets |
32680
add1683cc9e6
tests: add missing parens in test-obsolete-bundle-strip.t
Martin von Zweigbergk <martinvonz@google.com>
parents:
32629
diff
changeset
|
1209 # 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
|
1210 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1211 * all |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1212 |
9a65dbc4538f
test-obsolete-bundle-strip: test bundling in the sixth case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32601
diff
changeset
|
1213 $ 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
|
1214 ### 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
|
1215 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
|
1216 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
|
1217 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
|
1218 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
|
1219 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
|
1220 ### 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
|
1221 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
|
1222 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
|
1223 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
|
1224 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
|
1225 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
|
1226 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
|
1227 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
|
1228 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
|
1229 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
|
1230 # 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
|
1231 ### 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
|
1232 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
|
1233 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
|
1234 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
|
1235 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
|
1236 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
|
1237 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
|
1238 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
|
1239 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
|
1240 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
|
1241 ### 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
|
1242 ################################# |
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
|
1243 ### 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
|
1244 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
|
1245 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
|
1246 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
|
1247 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
|
1248 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
|
1249 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
|
1250 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
|
1251 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
|
1252 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
1253 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-eeb4258f-backup.hg (glob) |
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
|
1254 ### 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
|
1255 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
|
1256 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
|
1257 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
|
1258 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
|
1259 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
|
1260 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
|
1261 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
|
1262 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
|
1263 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
|
1264 ### 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
|
1265 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1266 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1267 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
|
1268 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
|
1269 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
|
1270 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
|
1271 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
|
1272 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
|
1273 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
|
1274 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
|
1275 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
|
1276 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1277 ################################# |
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
|
1278 # 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
|
1279 # 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
|
1280 # 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
|
1281 # 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
|
1282 # unbundling: 9 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
|
1283 # 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
|
1284 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1285 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
|
1286 =========================== |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1287 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1288 . ⊗ 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
|
1289 . | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1290 . ◕ 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
|
1291 . | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1292 . ● |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1293 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1294 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
|
1295 ----- |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1296 |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
1297 $ 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
|
1298 $ 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
|
1299 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
|
1300 $ 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
|
1301 $ 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
|
1302 $ 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
|
1303 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
|
1304 |
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 $ 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
|
1306 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
|
1307 $ 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
|
1308 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
|
1309 | |
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 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
|
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 @ 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
|
1313 |
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 $ 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
|
1315 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
|
1316 |
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 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
|
1318 -------------- |
32603
5d44d7d4076e
test-obsolete-bundle-strip: test bundling in the seventh case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32602
diff
changeset
|
1319 $ 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
|
1320 ### 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
|
1321 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
|
1322 ### 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
|
1323 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
|
1324 # 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
|
1325 ### 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
|
1326 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
|
1327 ### 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
|
1328 ################################# |
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
|
1329 ### 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
|
1330 $ 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
|
1331 ### 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
|
1332 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
|
1333 ### 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
|
1334 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
|
1335 # 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
|
1336 ### 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
|
1337 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
|
1338 ### 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
|
1339 ################################# |
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
|
1340 ### 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
|
1341 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
1342 # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/cefb651fc2fd-345c8dfa-backup.hg (glob) |
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
|
1343 ### 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
|
1344 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
|
1345 ### 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
|
1346 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1347 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1348 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
|
1349 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1350 ################################# |
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
|
1351 # 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
|
1352 # 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
|
1353 # 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
|
1354 # 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
|
1355 # 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
|
1356 # 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
|
1357 $ 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
|
1358 ### 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
|
1359 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
|
1360 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
|
1361 ### 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
|
1362 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
|
1363 # 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
|
1364 ### 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
|
1365 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
|
1366 ### 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
|
1367 ################################# |
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
|
1368 ### 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
|
1369 cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32693
c401ad7fdf86
test-obsolete-bundle-strip: add globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32685
diff
changeset
|
1370 # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/9ac430e15fca-b9855b02-backup.hg (glob) |
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
|
1371 ### 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
|
1372 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
|
1373 ### 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
|
1374 ################################# |
32629
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1375 ### Stripped markers ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1376 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
|
1377 ### diff <exclusive> <stripped> ### |
71eb6a098315
strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32627
diff
changeset
|
1378 ################################# |
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
|
1379 # 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
|
1380 # 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
|
1381 # 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
|
1382 # 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
|
1383 # unbundling: 1 new obsolescence markers |
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
|
1384 # unbundling: (run 'hg update' to get a working copy) |