Show More
@@ -1,802 +1,1032 b'' | |||||
1 | ================================================== |
|
1 | ================================================== | |
2 | Test obsmarkers interaction with bundle and strip |
|
2 | Test obsmarkers interaction with bundle and strip | |
3 | ================================================== |
|
3 | ================================================== | |
4 |
|
4 | |||
5 | The file currently only contains test for bundle. |
|
|||
6 | Testing of strip will happen some time soon (tm). |
|
|||
7 |
|
||||
8 | Setup a repository with various case |
|
5 | Setup a repository with various case | |
9 | ==================================== |
|
6 | ==================================== | |
10 |
|
7 | |||
11 | Config setup |
|
8 | Config setup | |
12 | ------------ |
|
9 | ------------ | |
13 |
|
10 | |||
14 | $ cat >> $HGRCPATH <<EOF |
|
11 | $ cat >> $HGRCPATH <<EOF | |
15 | > [ui] |
|
12 | > [ui] | |
16 | > # simpler log output |
|
13 | > # simpler log output | |
17 | > logtemplate = "{node|short}: {desc}\n" |
|
14 | > logtemplate = "{node|short}: {desc}\n" | |
18 | > |
|
15 | > | |
19 | > [experimental] |
|
16 | > [experimental] | |
20 | > # enable evolution |
|
17 | > # enable evolution | |
21 | > evolution = all |
|
18 | > evolution = all | |
22 | > |
|
19 | > | |
23 | > # include obsmarkers in bundle |
|
20 | > # include obsmarkers in bundle | |
24 | > evolution.bundle-obsmarker = yes |
|
21 | > evolution.bundle-obsmarker = yes | |
25 | > |
|
22 | > | |
26 | > [extensions] |
|
23 | > [extensions] | |
27 | > # needed for some tests |
|
24 | > # needed for some tests | |
28 | > strip = |
|
25 | > strip = | |
29 | > [defaults] |
|
26 | > [defaults] | |
30 | > # we'll query many hidden changeset |
|
27 | > # we'll query many hidden changeset | |
31 | > debugobsolete = --hidden |
|
28 | > debugobsolete = --hidden | |
32 | > EOF |
|
29 | > EOF | |
33 |
|
30 | |||
34 | $ mkcommit() { |
|
31 | $ mkcommit() { | |
35 | > echo "$1" > "$1" |
|
32 | > echo "$1" > "$1" | |
36 | > hg add "$1" |
|
33 | > hg add "$1" | |
37 | > hg ci -m "$1" |
|
34 | > hg ci -m "$1" | |
38 | > } |
|
35 | > } | |
39 |
|
36 | |||
40 | $ getid() { |
|
37 | $ getid() { | |
41 | > hg log --hidden --template '{node}\n' --rev "$1" |
|
38 | > hg log --hidden --template '{node}\n' --rev "$1" | |
42 | > } |
|
39 | > } | |
43 |
|
40 | |||
44 | $ mktestrepo () { |
|
41 | $ mktestrepo () { | |
45 | > [ -n "$1" ] || exit 1 |
|
42 | > [ -n "$1" ] || exit 1 | |
46 | > cd $TESTTMP |
|
43 | > cd $TESTTMP | |
47 | > hg init $1 |
|
44 | > hg init $1 | |
48 | > cd $1 |
|
45 | > cd $1 | |
49 | > mkcommit ROOT |
|
46 | > mkcommit ROOT | |
50 | > } |
|
47 | > } | |
51 |
|
48 | |||
52 | Function to compare the expected bundled obsmarkers with the actually bundled |
|
49 | Function to compare the expected bundled obsmarkers with the actually bundled | |
53 | obsmarkers. |
|
50 | obsmarkers. It also check the obsmarkers backed up during strip. | |
54 |
|
51 | |||
55 | $ testrevs () { |
|
52 | $ testrevs () { | |
56 | > revs="$1" |
|
53 | > revs="$1" | |
57 | > testname=`basename \`pwd\`` |
|
54 | > testname=`basename \`pwd\`` | |
58 | > revsname=`hg --hidden log -T '-{desc}\n' --rev "${revs}"` |
|
55 | > revsname=`hg --hidden log -T '-{desc}\n' --rev "${revs}"` | |
59 | > prefix="${TESTTMP}/${testname}${revsname}" |
|
56 | > prefix="${TESTTMP}/${testname}${revsname}" | |
60 | > markersfile="${prefix}-relevant-markers.txt" |
|
57 | > markersfile="${prefix}-relevant-markers.txt" | |
61 | > bundlefile="${prefix}-bundle.hg" |
|
58 | > bundlefile="${prefix}-bundle.hg" | |
62 | > contentfile="${prefix}-bundle-markers.hg" |
|
59 | > contentfile="${prefix}-bundle-markers.hg" | |
|
60 | > stripcontentfile="${prefix}-bundle-markers.hg" | |||
63 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" |
|
61 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" | |
64 | > echo '### Matched revisions###' |
|
62 | > echo '### Matched revisions###' | |
65 | > hg log --hidden --rev "${revs}" | sort |
|
63 | > hg log --hidden --rev "${revs}" | sort | |
66 | > echo '### Relevant markers ###' |
|
64 | > echo '### Relevant markers ###' | |
67 | > cat "${markersfile}" |
|
65 | > cat "${markersfile}" | |
68 | > printf "# bundling: " |
|
66 | > printf "# bundling: " | |
69 | > hg bundle --hidden --base "parents(roots(${revs}))" --rev "${revs}" "${bundlefile}" |
|
67 | > hg bundle --hidden --base "parents(roots(${revs}))" --rev "${revs}" "${bundlefile}" | |
70 | > hg debugbundle "${bundlefile}" | grep "obsmarkers --" -A 100 | sed 1,2d > "${contentfile}" |
|
68 | > hg debugbundle "${bundlefile}" | grep "obsmarkers --" -A 100 | sed 1,2d > "${contentfile}" | |
71 | > echo '### Bundled markers ###' |
|
69 | > echo '### Bundled markers ###' | |
72 | > cat "${contentfile}" |
|
70 | > cat "${contentfile}" | |
73 | > echo '### diff <relevant> <bundled> ###' |
|
71 | > echo '### diff <relevant> <bundled> ###' | |
74 | > cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}" |
|
72 | > cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}" | |
75 | > echo '#################################' |
|
73 | > echo '#################################' | |
|
74 | > # if the matched revs do not have children, we also check the result of strip | |||
|
75 | > orphan=`hg log --hidden -T '.\n' --rev "(not ${revs}) and (${revs}::)" | wc -l | sed -e 's/ //g'` | |||
|
76 | > if [ $orphan -eq 0 ]; | |||
|
77 | > then | |||
|
78 | > printf "# stripping: " | |||
|
79 | > hg strip --hidden --rev "${revs}" | |||
|
80 | > hg debugbundle .hg/strip-backup/* | grep "obsmarkers --" -A 100 | sed 1,2d > "${stripcontentfile}" | |||
|
81 | > echo '### Backup markers ###' | |||
|
82 | > cat "${stripcontentfile}" | |||
|
83 | > echo '### diff <relevant> <backed-up> ###' | |||
|
84 | > cmp "${markersfile}" "${stripcontentfile}" || diff -u "${markersfile}" "${stripcontentfile}" | |||
|
85 | > echo '#################################' | |||
|
86 | > hg unbundle .hg/strip-backup/* | sed 's/^/# unbundling: /' | |||
|
87 | > # clean up directory for the next test | |||
|
88 | > rm .hg/strip-backup/* | |||
|
89 | > fi | |||
76 | > } |
|
90 | > } | |
77 |
|
91 | |||
78 | root setup |
|
92 | root setup | |
79 | ------------- |
|
93 | ------------- | |
80 |
|
94 | |||
81 | simple chain |
|
95 | simple chain | |
82 | ============ |
|
96 | ============ | |
83 |
|
97 | |||
84 | . A0 |
|
98 | . A0 | |
85 | . β ΓΈβ β A1 |
|
99 | . β ΓΈβ β A1 | |
86 | . |/ |
|
100 | . |/ | |
87 | . β |
|
101 | . β | |
88 |
|
102 | |||
89 | setup |
|
103 | setup | |
90 | ----- |
|
104 | ----- | |
91 |
|
105 | |||
92 | $ mktestrepo simple-chain |
|
106 | $ mktestrepo simple-chain | |
93 |
$ mkcommit ' |
|
107 | $ mkcommit 'C-A0' | |
94 | $ hg up 'desc("ROOT")' |
|
108 | $ hg up 'desc("ROOT")' | |
95 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
109 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
96 | $ mkcommit 'C-A1' |
|
110 | $ mkcommit 'C-A1' | |
97 | created new head |
|
111 | created new head | |
98 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
112 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
99 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 |
|
113 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 | |
100 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` |
|
114 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` | |
101 |
|
115 | |||
102 | $ hg up 'desc("ROOT")' |
|
116 | $ hg up 'desc("ROOT")' | |
103 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
117 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
104 | $ hg log --hidden -G |
|
118 | $ hg log --hidden -G | |
105 | o cf2c22470d67: C-A1 |
|
119 | o cf2c22470d67: C-A1 | |
106 | | |
|
120 | | | |
107 | | x 84fcb0dfe17b: C-A0 |
|
121 | | x 84fcb0dfe17b: C-A0 | |
108 | |/ |
|
122 | |/ | |
109 | @ ea207398892e: ROOT |
|
123 | @ ea207398892e: ROOT | |
110 |
|
124 | |||
111 | $ hg debugobsolete |
|
125 | $ hg debugobsolete | |
112 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
126 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
113 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
127 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
114 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
128 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
115 |
|
129 | |||
116 | Actual testing |
|
130 | Actual testing | |
117 | -------------- |
|
131 | -------------- | |
118 |
|
132 | |||
119 | $ testrevs 'desc("C-A0")' |
|
133 | $ testrevs 'desc("C-A0")' | |
120 | ### Matched revisions### |
|
134 | ### Matched revisions### | |
121 | 84fcb0dfe17b: C-A0 |
|
135 | 84fcb0dfe17b: C-A0 | |
122 | ### Relevant markers ### |
|
136 | ### Relevant markers ### | |
123 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
137 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
124 | # bundling: 1 changesets found |
|
138 | # bundling: 1 changesets found | |
125 | ### Bundled markers ### |
|
139 | ### Bundled markers ### | |
126 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
140 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
127 | ### diff <relevant> <bundled> ### |
|
141 | ### diff <relevant> <bundled> ### | |
128 | ################################# |
|
142 | ################################# | |
|
143 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg | |||
|
144 | ### Backup markers ### | |||
|
145 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
146 | ### diff <relevant> <backed-up> ### | |||
|
147 | ################################# | |||
|
148 | # unbundling: adding changesets | |||
|
149 | # unbundling: adding manifests | |||
|
150 | # unbundling: adding file changes | |||
|
151 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
152 | # unbundling: (run 'hg heads' to see heads) | |||
129 |
|
153 | |||
130 | $ testrevs 'desc("C-A1")' |
|
154 | $ testrevs 'desc("C-A1")' | |
131 | ### Matched revisions### |
|
155 | ### Matched revisions### | |
132 | cf2c22470d67: C-A1 |
|
156 | cf2c22470d67: C-A1 | |
133 | ### Relevant markers ### |
|
157 | ### Relevant markers ### | |
134 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
158 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
135 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
159 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
136 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
160 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
137 | # bundling: 1 changesets found |
|
161 | # bundling: 1 changesets found | |
138 | ### Bundled markers ### |
|
162 | ### Bundled markers ### | |
139 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
163 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
140 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
164 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
141 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
165 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
142 | ### diff <relevant> <bundled> ### |
|
166 | ### diff <relevant> <bundled> ### | |
143 | ################################# |
|
167 | ################################# | |
|
168 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |||
|
169 | ### Backup markers ### | |||
|
170 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
171 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
172 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
173 | ### diff <relevant> <backed-up> ### | |||
|
174 | ################################# | |||
|
175 | # unbundling: adding changesets | |||
|
176 | # unbundling: adding manifests | |||
|
177 | # unbundling: adding file changes | |||
|
178 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
179 | # unbundling: (run 'hg heads' to see heads) | |||
144 |
|
180 | |||
145 | $ testrevs 'desc("C-A")' |
|
181 | $ testrevs 'desc("C-A")' | |
146 | ### Matched revisions### |
|
182 | ### Matched revisions### | |
147 | 84fcb0dfe17b: C-A0 |
|
183 | 84fcb0dfe17b: C-A0 | |
148 | cf2c22470d67: C-A1 |
|
184 | cf2c22470d67: C-A1 | |
149 | ### Relevant markers ### |
|
185 | ### Relevant markers ### | |
150 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
186 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
151 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
187 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
152 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
188 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
153 | # bundling: 2 changesets found |
|
189 | # bundling: 2 changesets found | |
154 | ### Bundled markers ### |
|
190 | ### Bundled markers ### | |
155 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
191 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
156 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
192 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
157 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
193 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
158 | ### diff <relevant> <bundled> ### |
|
194 | ### diff <relevant> <bundled> ### | |
159 | ################################# |
|
195 | ################################# | |
|
196 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg | |||
|
197 | ### Backup markers ### | |||
|
198 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
199 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
200 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
201 | ### diff <relevant> <backed-up> ### | |||
|
202 | ################################# | |||
|
203 | # unbundling: adding changesets | |||
|
204 | # unbundling: adding manifests | |||
|
205 | # unbundling: adding file changes | |||
|
206 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) | |||
|
207 | # unbundling: (run 'hg heads' to see heads) | |||
160 |
|
208 | |||
161 | chain with prune children |
|
209 | chain with prune children | |
162 | ========================= |
|
210 | ========================= | |
163 |
|
211 | |||
164 | . β β B0 |
|
212 | . β β B0 | |
165 | . | |
|
213 | . | | |
166 | . β ΓΈβ β A1 |
|
214 | . β ΓΈβ β A1 | |
167 | . | |
|
215 | . | | |
168 | . β |
|
216 | . β | |
169 |
|
217 | |||
170 | setup |
|
218 | setup | |
171 | ----- |
|
219 | ----- | |
172 |
|
220 | |||
173 | $ mktestrepo prune |
|
221 | $ mktestrepo prune | |
174 | $ mkcommit 'C-A0' |
|
222 | $ mkcommit 'C-A0' | |
175 | $ mkcommit 'C-B0' |
|
223 | $ mkcommit 'C-B0' | |
176 | $ hg up 'desc("ROOT")' |
|
224 | $ hg up 'desc("ROOT")' | |
177 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
225 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
178 | $ mkcommit 'C-A1' |
|
226 | $ mkcommit 'C-A1' | |
179 | created new head |
|
227 | created new head | |
180 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
228 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
181 |
$ hg debugobsolete `getid 'desc("C-A0") |
|
229 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
182 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
230 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
183 | $ hg up 'desc("ROOT")' |
|
231 | $ hg up 'desc("ROOT")' | |
184 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
232 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
185 | $ hg log --hidden -G |
|
233 | $ hg log --hidden -G | |
186 | o cf2c22470d67: C-A1 |
|
234 | o cf2c22470d67: C-A1 | |
187 | | |
|
235 | | | |
188 | | x 29f93b1df87b: C-B0 |
|
236 | | x 29f93b1df87b: C-B0 | |
189 | | | |
|
237 | | | | |
190 | | x 84fcb0dfe17b: C-A0 |
|
238 | | x 84fcb0dfe17b: C-A0 | |
191 | |/ |
|
239 | |/ | |
192 | @ ea207398892e: ROOT |
|
240 | @ ea207398892e: ROOT | |
193 |
|
241 | |||
194 | $ hg debugobsolete |
|
242 | $ hg debugobsolete | |
195 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
243 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
196 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
244 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
197 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
245 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
198 |
|
246 | |||
199 | Actual testing |
|
247 | Actual testing | |
200 | -------------- |
|
248 | -------------- | |
201 |
|
249 | |||
202 | $ testrevs 'desc("C-A0")' |
|
250 | $ testrevs 'desc("C-A0")' | |
203 | ### Matched revisions### |
|
251 | ### Matched revisions### | |
204 | 84fcb0dfe17b: C-A0 |
|
252 | 84fcb0dfe17b: C-A0 | |
205 | ### Relevant markers ### |
|
253 | ### Relevant markers ### | |
206 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
254 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
207 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
255 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
208 | # bundling: 1 changesets found |
|
256 | # bundling: 1 changesets found | |
209 | ### Bundled markers ### |
|
257 | ### Bundled markers ### | |
210 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
258 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
211 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
259 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
212 | ### diff <relevant> <bundled> ### |
|
260 | ### diff <relevant> <bundled> ### | |
213 | ################################# |
|
261 | ################################# | |
214 |
|
262 | |||
215 | $ testrevs 'desc("C-B0")' |
|
263 | $ testrevs 'desc("C-B0")' | |
216 | ### Matched revisions### |
|
264 | ### Matched revisions### | |
217 | 29f93b1df87b: C-B0 |
|
265 | 29f93b1df87b: C-B0 | |
218 | ### Relevant markers ### |
|
266 | ### Relevant markers ### | |
219 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
267 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
220 | # bundling: 1 changesets found |
|
268 | # bundling: 1 changesets found | |
221 | ### Bundled markers ### |
|
269 | ### Bundled markers ### | |
222 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
270 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
223 | ### diff <relevant> <bundled> ### |
|
271 | ### diff <relevant> <bundled> ### | |
224 | ################################# |
|
272 | ################################# | |
|
273 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/29f93b1df87b-7fb32101-backup.hg | |||
|
274 | ### Backup markers ### | |||
|
275 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
276 | ### diff <relevant> <backed-up> ### | |||
|
277 | ################################# | |||
|
278 | # unbundling: adding changesets | |||
|
279 | # unbundling: adding manifests | |||
|
280 | # unbundling: adding file changes | |||
|
281 | # unbundling: added 1 changesets with 1 changes to 1 files | |||
|
282 | # unbundling: (run 'hg update' to get a working copy) | |||
225 |
|
283 | |||
226 | $ testrevs 'desc("C-A1")' |
|
284 | $ testrevs 'desc("C-A1")' | |
227 | ### Matched revisions### |
|
285 | ### Matched revisions### | |
228 | cf2c22470d67: C-A1 |
|
286 | cf2c22470d67: C-A1 | |
229 | ### Relevant markers ### |
|
287 | ### Relevant markers ### | |
230 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
288 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
231 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
289 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
232 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
290 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
233 | # bundling: 1 changesets found |
|
291 | # bundling: 1 changesets found | |
234 | ### Bundled markers ### |
|
292 | ### Bundled markers ### | |
235 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
293 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
236 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
294 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
237 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
295 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
238 | ### diff <relevant> <bundled> ### |
|
296 | ### diff <relevant> <bundled> ### | |
239 | ################################# |
|
297 | ################################# | |
|
298 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |||
|
299 | ### Backup markers ### | |||
|
300 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
301 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
302 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
303 | ### diff <relevant> <backed-up> ### | |||
|
304 | ################################# | |||
|
305 | # unbundling: adding changesets | |||
|
306 | # unbundling: adding manifests | |||
|
307 | # unbundling: adding file changes | |||
|
308 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
309 | # unbundling: (run 'hg heads' to see heads) | |||
240 |
|
310 | |||
241 | bundling multiple revisions |
|
311 | bundling multiple revisions | |
242 |
|
312 | |||
243 | $ testrevs 'desc("C-A")' |
|
313 | $ testrevs 'desc("C-A")' | |
244 | ### Matched revisions### |
|
314 | ### Matched revisions### | |
245 | 84fcb0dfe17b: C-A0 |
|
315 | 84fcb0dfe17b: C-A0 | |
246 | cf2c22470d67: C-A1 |
|
316 | cf2c22470d67: C-A1 | |
247 | ### Relevant markers ### |
|
317 | ### Relevant markers ### | |
248 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
318 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
249 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
319 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
250 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
320 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
251 | # bundling: 2 changesets found |
|
321 | # bundling: 2 changesets found | |
252 | ### Bundled markers ### |
|
322 | ### Bundled markers ### | |
253 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
323 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
254 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
324 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
255 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
325 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
256 | ### diff <relevant> <bundled> ### |
|
326 | ### diff <relevant> <bundled> ### | |
257 | ################################# |
|
327 | ################################# | |
258 |
|
328 | |||
259 | $ testrevs 'desc("C-")' |
|
329 | $ testrevs 'desc("C-")' | |
260 | ### Matched revisions### |
|
330 | ### Matched revisions### | |
261 | 29f93b1df87b: C-B0 |
|
331 | 29f93b1df87b: C-B0 | |
262 | 84fcb0dfe17b: C-A0 |
|
332 | 84fcb0dfe17b: C-A0 | |
263 | cf2c22470d67: C-A1 |
|
333 | cf2c22470d67: C-A1 | |
264 | ### Relevant markers ### |
|
334 | ### Relevant markers ### | |
265 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
335 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
266 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
336 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
267 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
337 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
268 | # bundling: 3 changesets found |
|
338 | # bundling: 3 changesets found | |
269 | ### Bundled markers ### |
|
339 | ### Bundled markers ### | |
270 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
340 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
271 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
341 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
272 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
342 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
273 | ### diff <relevant> <bundled> ### |
|
343 | ### diff <relevant> <bundled> ### | |
274 | ################################# |
|
344 | ################################# | |
|
345 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-884c33b0-backup.hg | |||
|
346 | ### Backup markers ### | |||
|
347 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
348 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
349 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
350 | ### diff <relevant> <backed-up> ### | |||
|
351 | ################################# | |||
|
352 | # unbundling: adding changesets | |||
|
353 | # unbundling: adding manifests | |||
|
354 | # unbundling: adding file changes | |||
|
355 | # unbundling: added 3 changesets with 3 changes to 3 files (+1 heads) | |||
|
356 | # unbundling: (run 'hg heads' to see heads) | |||
275 |
|
357 | |||
276 | chain with precursors also pruned |
|
358 | chain with precursors also pruned | |
277 | ================================= |
|
359 | ================================= | |
278 |
|
360 | |||
279 | . A0 (also pruned) |
|
361 | . A0 (also pruned) | |
280 | . β ΓΈβ β A1 |
|
362 | . β ΓΈβ β A1 | |
281 | . | |
|
363 | . | | |
282 | . β |
|
364 | . β | |
283 |
|
365 | |||
284 | setup |
|
366 | setup | |
285 | ----- |
|
367 | ----- | |
286 |
|
368 | |||
287 | $ mktestrepo prune-inline |
|
369 | $ mktestrepo prune-inline | |
288 | $ mkcommit 'C-A0' |
|
370 | $ mkcommit 'C-A0' | |
289 | $ hg up 'desc("ROOT")' |
|
371 | $ hg up 'desc("ROOT")' | |
290 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
372 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
291 | $ mkcommit 'C-A1' |
|
373 | $ mkcommit 'C-A1' | |
292 | created new head |
|
374 | created new head | |
293 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
375 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
294 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
376 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
295 |
$ hg debugobsolete `getid 'desc("C-A0") |
|
377 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
296 | $ hg up 'desc("ROOT")' |
|
378 | $ hg up 'desc("ROOT")' | |
297 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
379 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
298 | $ hg log --hidden -G |
|
380 | $ hg log --hidden -G | |
299 | o cf2c22470d67: C-A1 |
|
381 | o cf2c22470d67: C-A1 | |
300 | | |
|
382 | | | |
301 | | x 84fcb0dfe17b: C-A0 |
|
383 | | x 84fcb0dfe17b: C-A0 | |
302 | |/ |
|
384 | |/ | |
303 | @ ea207398892e: ROOT |
|
385 | @ ea207398892e: ROOT | |
304 |
|
386 | |||
305 | $ hg debugobsolete |
|
387 | $ hg debugobsolete | |
306 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
388 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
307 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
389 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
308 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
390 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
309 |
|
391 | |||
310 | Actual testing |
|
392 | Actual testing | |
311 | -------------- |
|
393 | -------------- | |
312 |
|
394 | |||
313 | $ testrevs 'desc("C-A0")' |
|
395 | $ testrevs 'desc("C-A0")' | |
314 | ### Matched revisions### |
|
396 | ### Matched revisions### | |
315 | 84fcb0dfe17b: C-A0 |
|
397 | 84fcb0dfe17b: C-A0 | |
316 | ### Relevant markers ### |
|
398 | ### Relevant markers ### | |
317 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
399 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
318 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
400 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
319 | # bundling: 1 changesets found |
|
401 | # bundling: 1 changesets found | |
320 | ### Bundled markers ### |
|
402 | ### Bundled markers ### | |
321 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
403 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
322 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
404 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
323 | ### diff <relevant> <bundled> ### |
|
405 | ### diff <relevant> <bundled> ### | |
324 | ################################# |
|
406 | ################################# | |
|
407 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg | |||
|
408 | ### Backup markers ### | |||
|
409 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
410 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
411 | ### diff <relevant> <backed-up> ### | |||
|
412 | ################################# | |||
|
413 | # unbundling: adding changesets | |||
|
414 | # unbundling: adding manifests | |||
|
415 | # unbundling: adding file changes | |||
|
416 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
417 | # unbundling: (run 'hg heads' to see heads) | |||
325 |
|
418 | |||
326 | $ testrevs 'desc("C-A1")' |
|
419 | $ testrevs 'desc("C-A1")' | |
327 | ### Matched revisions### |
|
420 | ### Matched revisions### | |
328 | cf2c22470d67: C-A1 |
|
421 | cf2c22470d67: C-A1 | |
329 | ### Relevant markers ### |
|
422 | ### Relevant markers ### | |
330 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
423 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
331 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
424 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
332 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
425 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
333 | # bundling: 1 changesets found |
|
426 | # bundling: 1 changesets found | |
334 | ### Bundled markers ### |
|
427 | ### Bundled markers ### | |
335 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
428 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
336 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
429 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
337 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
430 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
338 | ### diff <relevant> <bundled> ### |
|
431 | ### diff <relevant> <bundled> ### | |
339 | ################################# |
|
432 | ################################# | |
|
433 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |||
|
434 | ### Backup markers ### | |||
|
435 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
436 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
437 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
438 | ### diff <relevant> <backed-up> ### | |||
|
439 | ################################# | |||
|
440 | # unbundling: adding changesets | |||
|
441 | # unbundling: adding manifests | |||
|
442 | # unbundling: adding file changes | |||
|
443 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
444 | # unbundling: (run 'hg heads' to see heads) | |||
340 |
|
445 | |||
341 | $ testrevs 'desc("C-A")' |
|
446 | $ testrevs 'desc("C-A")' | |
342 | ### Matched revisions### |
|
447 | ### Matched revisions### | |
343 | 84fcb0dfe17b: C-A0 |
|
448 | 84fcb0dfe17b: C-A0 | |
344 | cf2c22470d67: C-A1 |
|
449 | cf2c22470d67: C-A1 | |
345 | ### Relevant markers ### |
|
450 | ### Relevant markers ### | |
346 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
451 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
347 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
452 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
348 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
453 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
349 | # bundling: 2 changesets found |
|
454 | # bundling: 2 changesets found | |
350 | ### Bundled markers ### |
|
455 | ### Bundled markers ### | |
351 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
456 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
352 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
457 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
353 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
458 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
354 | ### diff <relevant> <bundled> ### |
|
459 | ### diff <relevant> <bundled> ### | |
355 | ################################# |
|
460 | ################################# | |
|
461 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg | |||
|
462 | ### Backup markers ### | |||
|
463 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
464 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
465 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
466 | ### diff <relevant> <backed-up> ### | |||
|
467 | ################################# | |||
|
468 | # unbundling: adding changesets | |||
|
469 | # unbundling: adding manifests | |||
|
470 | # unbundling: adding file changes | |||
|
471 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) | |||
|
472 | # unbundling: (run 'hg heads' to see heads) | |||
356 |
|
473 | |||
357 | chain with missing prune |
|
474 | chain with missing prune | |
358 | ======================== |
|
475 | ======================== | |
359 |
|
476 | |||
360 | . β B |
|
477 | . β B | |
361 | . | |
|
478 | . | | |
362 | . β ββ β A1 |
|
479 | . β ββ β A1 | |
363 | . | |
|
480 | . | | |
364 | . β |
|
481 | . β | |
365 |
|
482 | |||
366 | setup |
|
483 | setup | |
367 | ----- |
|
484 | ----- | |
368 |
|
485 | |||
369 | $ mktestrepo missing-prune |
|
486 | $ mktestrepo missing-prune | |
370 | $ mkcommit 'C-A0' |
|
487 | $ mkcommit 'C-A0' | |
371 | $ mkcommit 'C-B0' |
|
488 | $ mkcommit 'C-B0' | |
372 | $ hg up 'desc("ROOT")' |
|
489 | $ hg up 'desc("ROOT")' | |
373 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
490 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
374 | $ mkcommit 'C-A1' |
|
491 | $ mkcommit 'C-A1' | |
375 | created new head |
|
492 | created new head | |
376 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
493 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
377 |
$ hg debugobsolete `getid 'desc("C-A0") |
|
494 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
378 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
495 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
379 |
|
496 | |||
380 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
497 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
381 |
|
498 | |||
382 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
|
499 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup | |
383 |
|
500 | |||
384 | $ hg up 'desc("ROOT")' |
|
501 | $ hg up 'desc("ROOT")' | |
385 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
502 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
386 | $ hg log --hidden -G |
|
503 | $ hg log --hidden -G | |
387 | o cf2c22470d67: C-A1 |
|
504 | o cf2c22470d67: C-A1 | |
388 | | |
|
505 | | | |
389 | @ ea207398892e: ROOT |
|
506 | @ ea207398892e: ROOT | |
390 |
|
507 | |||
391 | $ hg debugobsolete |
|
508 | $ hg debugobsolete | |
392 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
509 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
393 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
510 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
394 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
511 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
395 |
|
512 | |||
396 | Actual testing |
|
513 | Actual testing | |
397 | -------------- |
|
514 | -------------- | |
398 |
|
515 | |||
399 | $ testrevs 'desc("C-A1")' |
|
516 | $ testrevs 'desc("C-A1")' | |
400 | ### Matched revisions### |
|
517 | ### Matched revisions### | |
401 | cf2c22470d67: C-A1 |
|
518 | cf2c22470d67: C-A1 | |
402 | ### Relevant markers ### |
|
519 | ### Relevant markers ### | |
403 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
520 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
404 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
521 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
405 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
522 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
406 | # bundling: 1 changesets found |
|
523 | # bundling: 1 changesets found | |
407 | ### Bundled markers ### |
|
524 | ### Bundled markers ### | |
408 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
525 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
409 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
526 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
410 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
527 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
411 | ### diff <relevant> <bundled> ### |
|
528 | ### diff <relevant> <bundled> ### | |
412 | ################################# |
|
529 | ################################# | |
|
530 | # stripping: saved backup bundle to $TESTTMP/missing-prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |||
|
531 | ### Backup markers ### | |||
|
532 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
533 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
534 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
535 | ### diff <relevant> <backed-up> ### | |||
|
536 | ################################# | |||
|
537 | # unbundling: adding changesets | |||
|
538 | # unbundling: adding manifests | |||
|
539 | # unbundling: adding file changes | |||
|
540 | # unbundling: added 1 changesets with 1 changes to 1 files | |||
|
541 | # unbundling: (run 'hg update' to get a working copy) | |||
413 |
|
542 | |||
414 | chain with precursors also pruned |
|
543 | chain with precursors also pruned | |
415 | ================================= |
|
544 | ================================= | |
416 |
|
545 | |||
417 | . A0 (also pruned) |
|
546 | . A0 (also pruned) | |
418 | . β ββ β A1 |
|
547 | . β ββ β A1 | |
419 | . | |
|
548 | . | | |
420 | . β |
|
549 | . β | |
421 |
|
550 | |||
422 | setup |
|
551 | setup | |
423 | ----- |
|
552 | ----- | |
424 |
|
553 | |||
425 | $ mktestrepo prune-inline-missing |
|
554 | $ mktestrepo prune-inline-missing | |
426 | $ mkcommit 'C-A0' |
|
555 | $ mkcommit 'C-A0' | |
427 | $ hg up 'desc("ROOT")' |
|
556 | $ hg up 'desc("ROOT")' | |
428 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
557 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
429 | $ mkcommit 'C-A1' |
|
558 | $ mkcommit 'C-A1' | |
430 | created new head |
|
559 | created new head | |
431 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
560 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
432 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
561 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
433 |
$ hg debugobsolete `getid 'desc("C-A0") |
|
562 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
434 |
|
563 | |||
435 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
564 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
436 |
|
565 | |||
437 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
|
566 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup | |
438 |
|
567 | |||
439 | $ hg up 'desc("ROOT")' |
|
568 | $ hg up 'desc("ROOT")' | |
440 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
569 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
441 | $ hg log --hidden -G |
|
570 | $ hg log --hidden -G | |
442 | o cf2c22470d67: C-A1 |
|
571 | o cf2c22470d67: C-A1 | |
443 | | |
|
572 | | | |
444 | @ ea207398892e: ROOT |
|
573 | @ ea207398892e: ROOT | |
445 |
|
574 | |||
446 | $ hg debugobsolete |
|
575 | $ hg debugobsolete | |
447 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
576 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
448 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
577 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
449 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
578 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
450 |
|
579 | |||
451 | Actual testing |
|
580 | Actual testing | |
452 | -------------- |
|
581 | -------------- | |
453 |
|
582 | |||
454 | $ testrevs 'desc("C-A1")' |
|
583 | $ testrevs 'desc("C-A1")' | |
455 | ### Matched revisions### |
|
584 | ### Matched revisions### | |
456 | cf2c22470d67: C-A1 |
|
585 | cf2c22470d67: C-A1 | |
457 | ### Relevant markers ### |
|
586 | ### Relevant markers ### | |
458 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
587 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
459 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
588 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
460 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
589 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
461 | # bundling: 1 changesets found |
|
590 | # bundling: 1 changesets found | |
462 | ### Bundled markers ### |
|
591 | ### Bundled markers ### | |
463 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
592 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
464 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
593 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
465 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
594 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
466 | ### diff <relevant> <bundled> ### |
|
595 | ### diff <relevant> <bundled> ### | |
467 | ################################# |
|
596 | ################################# | |
|
597 | # stripping: saved backup bundle to $TESTTMP/prune-inline-missing/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg | |||
|
598 | ### Backup markers ### | |||
|
599 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
600 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
601 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
602 | ### diff <relevant> <backed-up> ### | |||
|
603 | ################################# | |||
|
604 | # unbundling: adding changesets | |||
|
605 | # unbundling: adding manifests | |||
|
606 | # unbundling: adding file changes | |||
|
607 | # unbundling: added 1 changesets with 1 changes to 1 files | |||
|
608 | # unbundling: (run 'hg update' to get a working copy) | |||
468 |
|
609 | |||
469 | Chain with fold and split |
|
610 | Chain with fold and split | |
470 | ========================= |
|
611 | ========================= | |
471 |
|
612 | |||
472 | setup |
|
613 | setup | |
473 | ----- |
|
614 | ----- | |
474 |
|
615 | |||
475 | $ mktestrepo split-fold |
|
616 | $ mktestrepo split-fold | |
476 | $ mkcommit 'C-A' |
|
617 | $ mkcommit 'C-A' | |
477 | $ hg up 'desc("ROOT")' |
|
618 | $ hg up 'desc("ROOT")' | |
478 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
619 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
479 | $ mkcommit 'C-B' |
|
620 | $ mkcommit 'C-B' | |
480 | created new head |
|
621 | created new head | |
481 | $ hg up 'desc("ROOT")' |
|
622 | $ hg up 'desc("ROOT")' | |
482 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
623 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
483 | $ mkcommit 'C-C' |
|
624 | $ mkcommit 'C-C' | |
484 | created new head |
|
625 | created new head | |
485 | $ hg up 'desc("ROOT")' |
|
626 | $ hg up 'desc("ROOT")' | |
486 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
627 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
487 | $ mkcommit 'C-D' |
|
628 | $ mkcommit 'C-D' | |
488 | created new head |
|
629 | created new head | |
489 | $ hg up 'desc("ROOT")' |
|
630 | $ hg up 'desc("ROOT")' | |
490 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
631 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
491 | $ mkcommit 'C-E' |
|
632 | $ mkcommit 'C-E' | |
492 | created new head |
|
633 | created new head | |
493 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` |
|
634 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` | |
494 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split |
|
635 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split | |
495 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
|
636 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent | |
496 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 |
|
637 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 | |
497 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` |
|
638 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` | |
498 |
$ hg debugobsolete `getid 'desc("C-B") |
|
639 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` | |
499 |
$ hg debugobsolete `getid 'desc("C-C") |
|
640 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` | |
500 |
$ hg debugobsolete `getid 'desc("C-D") |
|
641 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` | |
501 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` |
|
642 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` | |
502 |
|
643 | |||
503 | $ hg up 'desc("ROOT")' |
|
644 | $ hg up 'desc("ROOT")' | |
504 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
645 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
505 | $ hg log --hidden -G |
|
646 | $ hg log --hidden -G | |
506 | o 2f20ff6509f0: C-E |
|
647 | o 2f20ff6509f0: C-E | |
507 | | |
|
648 | | | |
508 | | x 06dc9da25ef0: C-D |
|
649 | | x 06dc9da25ef0: C-D | |
509 | |/ |
|
650 | |/ | |
510 | | x 27ec657ca21d: C-C |
|
651 | | x 27ec657ca21d: C-C | |
511 | |/ |
|
652 | |/ | |
512 | | x a9b9da38ed96: C-B |
|
653 | | x a9b9da38ed96: C-B | |
513 | |/ |
|
654 | |/ | |
514 | | x 9ac430e15fca: C-A |
|
655 | | x 9ac430e15fca: C-A | |
515 | |/ |
|
656 | |/ | |
516 | @ ea207398892e: ROOT |
|
657 | @ ea207398892e: ROOT | |
517 |
|
658 | |||
518 | $ hg debugobsolete |
|
659 | $ hg debugobsolete | |
519 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
660 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
520 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
661 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
521 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
662 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
522 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
663 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
523 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
664 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
524 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
665 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
525 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
666 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
526 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
667 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
527 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
668 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
528 |
|
669 | |||
529 | Actual testing |
|
670 | Actual testing | |
530 | -------------- |
|
671 | -------------- | |
531 |
|
672 | |||
532 | $ testrevs 'desc("C-A")' |
|
673 | $ testrevs 'desc("C-A")' | |
533 | ### Matched revisions### |
|
674 | ### Matched revisions### | |
534 | 9ac430e15fca: C-A |
|
675 | 9ac430e15fca: C-A | |
535 | ### Relevant markers ### |
|
676 | ### Relevant markers ### | |
536 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
677 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
537 | # bundling: 1 changesets found |
|
678 | # bundling: 1 changesets found | |
538 | ### Bundled markers ### |
|
679 | ### Bundled markers ### | |
539 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
680 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
540 | ### diff <relevant> <bundled> ### |
|
681 | ### diff <relevant> <bundled> ### | |
541 | ################################# |
|
682 | ################################# | |
|
683 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-81204eba-backup.hg | |||
|
684 | ### Backup markers ### | |||
|
685 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
686 | ### diff <relevant> <backed-up> ### | |||
|
687 | ################################# | |||
|
688 | # unbundling: adding changesets | |||
|
689 | # unbundling: adding manifests | |||
|
690 | # unbundling: adding file changes | |||
|
691 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
692 | # unbundling: (run 'hg heads' to see heads) | |||
542 |
|
693 | |||
543 | $ testrevs 'desc("C-B")' |
|
694 | $ testrevs 'desc("C-B")' | |
544 | ### Matched revisions### |
|
695 | ### Matched revisions### | |
545 | a9b9da38ed96: C-B |
|
696 | a9b9da38ed96: C-B | |
546 | ### Relevant markers ### |
|
697 | ### Relevant markers ### | |
547 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
698 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
548 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
699 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
549 | # bundling: 1 changesets found |
|
700 | # bundling: 1 changesets found | |
550 | ### Bundled markers ### |
|
701 | ### Bundled markers ### | |
551 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
702 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
552 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
703 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
553 | ### diff <relevant> <bundled> ### |
|
704 | ### diff <relevant> <bundled> ### | |
554 | ################################# |
|
705 | ################################# | |
|
706 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-7465d6e9-backup.hg | |||
|
707 | ### Backup markers ### | |||
|
708 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
709 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
710 | ### diff <relevant> <backed-up> ### | |||
|
711 | ################################# | |||
|
712 | # unbundling: adding changesets | |||
|
713 | # unbundling: adding manifests | |||
|
714 | # unbundling: adding file changes | |||
|
715 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
716 | # unbundling: (run 'hg heads' to see heads) | |||
555 |
|
717 | |||
556 | $ testrevs 'desc("C-C")' |
|
718 | $ testrevs 'desc("C-C")' | |
557 | ### Matched revisions### |
|
719 | ### Matched revisions### | |
558 | 27ec657ca21d: C-C |
|
720 | 27ec657ca21d: C-C | |
559 | ### Relevant markers ### |
|
721 | ### Relevant markers ### | |
560 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
722 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
561 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
723 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
562 | # bundling: 1 changesets found |
|
724 | # bundling: 1 changesets found | |
563 | ### Bundled markers ### |
|
725 | ### Bundled markers ### | |
564 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
726 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
565 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
727 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
566 | ### diff <relevant> <bundled> ### |
|
728 | ### diff <relevant> <bundled> ### | |
567 | ################################# |
|
729 | ################################# | |
|
730 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/27ec657ca21d-d5dd1c7c-backup.hg | |||
|
731 | ### Backup markers ### | |||
|
732 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
733 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
734 | ### diff <relevant> <backed-up> ### | |||
|
735 | ################################# | |||
|
736 | # unbundling: adding changesets | |||
|
737 | # unbundling: adding manifests | |||
|
738 | # unbundling: adding file changes | |||
|
739 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
740 | # unbundling: (run 'hg heads' to see heads) | |||
568 |
|
741 | |||
569 | $ testrevs 'desc("C-D")' |
|
742 | $ testrevs 'desc("C-D")' | |
570 | ### Matched revisions### |
|
743 | ### Matched revisions### | |
571 | 06dc9da25ef0: C-D |
|
744 | 06dc9da25ef0: C-D | |
572 | ### Relevant markers ### |
|
745 | ### Relevant markers ### | |
573 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
746 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
574 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
747 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
575 | # bundling: 1 changesets found |
|
748 | # bundling: 1 changesets found | |
576 | ### Bundled markers ### |
|
749 | ### Bundled markers ### | |
577 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
750 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
578 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
751 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
579 | ### diff <relevant> <bundled> ### |
|
752 | ### diff <relevant> <bundled> ### | |
580 | ################################# |
|
753 | ################################# | |
|
754 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/06dc9da25ef0-9b1c0a91-backup.hg | |||
|
755 | ### Backup markers ### | |||
|
756 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
757 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
758 | ### diff <relevant> <backed-up> ### | |||
|
759 | ################################# | |||
|
760 | # unbundling: adding changesets | |||
|
761 | # unbundling: adding manifests | |||
|
762 | # unbundling: adding file changes | |||
|
763 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
764 | # unbundling: (run 'hg heads' to see heads) | |||
581 |
|
765 | |||
582 | $ testrevs 'desc("C-E")' |
|
766 | $ testrevs 'desc("C-E")' | |
583 | ### Matched revisions### |
|
767 | ### Matched revisions### | |
584 | 2f20ff6509f0: C-E |
|
768 | 2f20ff6509f0: C-E | |
585 | ### Relevant markers ### |
|
769 | ### Relevant markers ### | |
586 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
770 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
587 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
771 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
588 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
772 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
589 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
773 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
590 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
774 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
591 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
775 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
592 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
776 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
593 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
777 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
594 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
778 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
595 | # bundling: 1 changesets found |
|
779 | # bundling: 1 changesets found | |
596 | ### Bundled markers ### |
|
780 | ### Bundled markers ### | |
597 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
781 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
598 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
782 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
599 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
783 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
600 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
784 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
601 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
785 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
602 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
786 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
603 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
787 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
604 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
788 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
605 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
789 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
606 | ### diff <relevant> <bundled> ### |
|
790 | ### diff <relevant> <bundled> ### | |
607 | ################################# |
|
791 | ################################# | |
|
792 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg | |||
|
793 | ### Backup markers ### | |||
|
794 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
795 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
796 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
797 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
798 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
799 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
800 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
801 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
802 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
803 | ### diff <relevant> <backed-up> ### | |||
|
804 | ################################# | |||
|
805 | # unbundling: adding changesets | |||
|
806 | # unbundling: adding manifests | |||
|
807 | # unbundling: adding file changes | |||
|
808 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
809 | # unbundling: (run 'hg heads' to see heads) | |||
608 |
|
810 | |||
609 | Bundle multiple revisions |
|
811 | Bundle multiple revisions | |
610 |
|
812 | |||
611 | * each part of the split |
|
813 | * each part of the split | |
612 |
|
814 | |||
613 | $ testrevs 'desc("C-B") + desc("C-C")' |
|
815 | $ testrevs 'desc("C-B") + desc("C-C")' | |
614 | ### Matched revisions### |
|
816 | ### Matched revisions### | |
615 | 27ec657ca21d: C-C |
|
817 | 27ec657ca21d: C-C | |
616 | a9b9da38ed96: C-B |
|
818 | a9b9da38ed96: C-B | |
617 | ### Relevant markers ### |
|
819 | ### Relevant markers ### | |
618 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
820 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
619 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
821 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
620 | # bundling: 2 changesets found |
|
822 | # bundling: 2 changesets found | |
621 | ### Bundled markers ### |
|
823 | ### Bundled markers ### | |
622 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
824 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
623 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
825 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
624 | ### diff <relevant> <bundled> ### |
|
826 | ### diff <relevant> <bundled> ### | |
625 | ################################# |
|
827 | ################################# | |
626 |
|
828 | |||
627 | * top one and other divergent |
|
829 | * top one and other divergent | |
628 |
|
830 | |||
629 | $ testrevs 'desc("C-E") + desc("C-D")' |
|
831 | $ testrevs 'desc("C-E") + desc("C-D")' | |
630 | ### Matched revisions### |
|
832 | ### Matched revisions### | |
631 | 06dc9da25ef0: C-D |
|
833 | 06dc9da25ef0: C-D | |
632 | 2f20ff6509f0: C-E |
|
834 | 2f20ff6509f0: C-E | |
633 | ### Relevant markers ### |
|
835 | ### Relevant markers ### | |
634 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
836 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
635 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
837 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
636 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
838 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
637 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
839 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
638 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
840 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
639 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
841 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
640 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
842 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
641 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
843 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
642 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
844 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
643 | # bundling: 2 changesets found |
|
845 | # bundling: 2 changesets found | |
644 | ### Bundled markers ### |
|
846 | ### Bundled markers ### | |
645 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
847 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
646 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
848 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
647 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
849 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
648 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
850 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
649 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
851 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
650 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
852 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
651 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
853 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
652 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
854 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
653 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
855 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
654 | ### diff <relevant> <bundled> ### |
|
856 | ### diff <relevant> <bundled> ### | |
655 | ################################# |
|
857 | ################################# | |
656 |
|
858 | |||
657 | * top one and initial precursors |
|
859 | * top one and initial precursors | |
658 |
|
860 | |||
659 | $ testrevs 'desc("C-E") + desc("C-A")' |
|
861 | $ testrevs 'desc("C-E") + desc("C-A")' | |
660 | ### Matched revisions### |
|
862 | ### Matched revisions### | |
661 | 2f20ff6509f0: C-E |
|
863 | 2f20ff6509f0: C-E | |
662 | 9ac430e15fca: C-A |
|
864 | 9ac430e15fca: C-A | |
663 | ### Relevant markers ### |
|
865 | ### Relevant markers ### | |
664 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
866 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
665 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
867 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
666 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
868 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
667 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
869 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
668 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
870 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
669 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
871 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
670 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
872 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
671 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
873 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
672 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
874 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
673 | # bundling: 2 changesets found |
|
875 | # bundling: 2 changesets found | |
674 | ### Bundled markers ### |
|
876 | ### Bundled markers ### | |
675 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
877 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
676 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
878 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
677 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
879 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
678 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
880 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
679 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
881 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
680 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
882 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
681 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
883 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
682 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
884 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
683 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
885 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
684 | ### diff <relevant> <bundled> ### |
|
886 | ### diff <relevant> <bundled> ### | |
685 | ################################# |
|
887 | ################################# | |
686 |
|
888 | |||
687 | * top one and one of the split |
|
889 | * top one and one of the split | |
688 |
|
890 | |||
689 | $ testrevs 'desc("C-E") + desc("C-C")' |
|
891 | $ testrevs 'desc("C-E") + desc("C-C")' | |
690 | ### Matched revisions### |
|
892 | ### Matched revisions### | |
691 | 27ec657ca21d: C-C |
|
893 | 27ec657ca21d: C-C | |
692 | 2f20ff6509f0: C-E |
|
894 | 2f20ff6509f0: C-E | |
693 | ### Relevant markers ### |
|
895 | ### Relevant markers ### | |
694 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
896 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
695 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
897 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
696 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
898 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
697 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
899 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
698 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
900 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
699 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
901 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
700 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
902 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
701 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
903 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
702 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
904 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
703 | # bundling: 2 changesets found |
|
905 | # bundling: 2 changesets found | |
704 | ### Bundled markers ### |
|
906 | ### Bundled markers ### | |
705 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
907 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
706 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
908 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
707 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
909 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
708 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
910 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
709 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
911 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
710 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
912 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
711 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
913 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
712 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
914 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
713 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
915 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
714 | ### diff <relevant> <bundled> ### |
|
916 | ### diff <relevant> <bundled> ### | |
715 | ################################# |
|
917 | ################################# | |
716 |
|
918 | |||
717 | * all |
|
919 | * all | |
718 |
|
920 | |||
719 | $ testrevs 'desc("C-")' |
|
921 | $ testrevs 'desc("C-")' | |
720 | ### Matched revisions### |
|
922 | ### Matched revisions### | |
721 | 06dc9da25ef0: C-D |
|
923 | 06dc9da25ef0: C-D | |
722 | 27ec657ca21d: C-C |
|
924 | 27ec657ca21d: C-C | |
723 | 2f20ff6509f0: C-E |
|
925 | 2f20ff6509f0: C-E | |
724 | 9ac430e15fca: C-A |
|
926 | 9ac430e15fca: C-A | |
725 | a9b9da38ed96: C-B |
|
927 | a9b9da38ed96: C-B | |
726 | ### Relevant markers ### |
|
928 | ### Relevant markers ### | |
727 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
929 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
728 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
930 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
729 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
931 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
730 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
932 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
731 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
933 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
732 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
934 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
733 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
935 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
734 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
936 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
735 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
937 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
736 | # bundling: 5 changesets found |
|
938 | # bundling: 5 changesets found | |
737 | ### Bundled markers ### |
|
939 | ### Bundled markers ### | |
738 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
940 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
739 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
941 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
740 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
942 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
741 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
943 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
742 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
944 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
743 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
945 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
744 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
946 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
745 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
947 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
746 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
948 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
747 | ### diff <relevant> <bundled> ### |
|
949 | ### diff <relevant> <bundled> ### | |
748 | ################################# |
|
950 | ################################# | |
|
951 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-eeb4258f-backup.hg | |||
|
952 | ### Backup markers ### | |||
|
953 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
954 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
955 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
956 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
957 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
958 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
959 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
960 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
961 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
962 | ### diff <relevant> <backed-up> ### | |||
|
963 | ################################# | |||
|
964 | # unbundling: adding changesets | |||
|
965 | # unbundling: adding manifests | |||
|
966 | # unbundling: adding file changes | |||
|
967 | # unbundling: added 5 changesets with 5 changes to 5 files (+4 heads) | |||
|
968 | # unbundling: (run 'hg heads' to see heads) | |||
749 |
|
969 | |||
750 | changeset pruned on its own |
|
970 | changeset pruned on its own | |
751 | =========================== |
|
971 | =========================== | |
752 |
|
972 | |||
753 | . β B |
|
973 | . β B | |
754 | . | |
|
974 | . | | |
755 | . β A |
|
975 | . β A | |
756 | . | |
|
976 | . | | |
757 | . β |
|
977 | . β | |
758 |
|
978 | |||
759 | setup |
|
979 | setup | |
760 | ----- |
|
980 | ----- | |
761 |
|
981 | |||
762 | $ mktestrepo lonely-prune |
|
982 | $ mktestrepo lonely-prune | |
763 | $ hg up 'desc("ROOT")' |
|
983 | $ hg up 'desc("ROOT")' | |
764 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
984 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
765 | $ mkcommit 'C-A' |
|
985 | $ mkcommit 'C-A' | |
766 | $ mkcommit 'C-B' |
|
986 | $ mkcommit 'C-B' | |
767 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` |
|
987 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` | |
768 |
|
988 | |||
769 | $ hg up 'desc("ROOT")' |
|
989 | $ hg up 'desc("ROOT")' | |
770 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
990 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
771 | $ hg log --hidden -G |
|
991 | $ hg log --hidden -G | |
772 | x cefb651fc2fd: C-B |
|
992 | x cefb651fc2fd: C-B | |
773 | | |
|
993 | | | |
774 | o 9ac430e15fca: C-A |
|
994 | o 9ac430e15fca: C-A | |
775 | | |
|
995 | | | |
776 | @ ea207398892e: ROOT |
|
996 | @ ea207398892e: ROOT | |
777 |
|
997 | |||
778 | $ hg debugobsolete |
|
998 | $ hg debugobsolete | |
779 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
999 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
780 |
|
1000 | |||
781 | Actual testing |
|
1001 | Actual testing | |
782 | -------------- |
|
1002 | -------------- | |
783 | $ testrevs 'desc("C-A")' |
|
1003 | $ testrevs 'desc("C-A")' | |
784 | ### Matched revisions### |
|
1004 | ### Matched revisions### | |
785 | 9ac430e15fca: C-A |
|
1005 | 9ac430e15fca: C-A | |
786 | ### Relevant markers ### |
|
1006 | ### Relevant markers ### | |
787 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1007 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
788 | # bundling: 1 changesets found |
|
1008 | # bundling: 1 changesets found | |
789 | ### Bundled markers ### |
|
1009 | ### Bundled markers ### | |
790 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1010 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
791 | ### diff <relevant> <bundled> ### |
|
1011 | ### diff <relevant> <bundled> ### | |
792 | ################################# |
|
1012 | ################################# | |
793 | $ testrevs 'desc("C-B")' |
|
1013 | $ testrevs 'desc("C-B")' | |
794 | ### Matched revisions### |
|
1014 | ### Matched revisions### | |
795 | cefb651fc2fd: C-B |
|
1015 | cefb651fc2fd: C-B | |
796 | ### Relevant markers ### |
|
1016 | ### Relevant markers ### | |
797 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1017 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
798 | # bundling: 1 changesets found |
|
1018 | # bundling: 1 changesets found | |
799 | ### Bundled markers ### |
|
1019 | ### Bundled markers ### | |
800 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1020 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
801 | ### diff <relevant> <bundled> ### |
|
1021 | ### diff <relevant> <bundled> ### | |
802 | ################################# |
|
1022 | ################################# | |
|
1023 | # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/cefb651fc2fd-345c8dfa-backup.hg | |||
|
1024 | ### Backup markers ### | |||
|
1025 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
1026 | ### diff <relevant> <backed-up> ### | |||
|
1027 | ################################# | |||
|
1028 | # unbundling: adding changesets | |||
|
1029 | # unbundling: adding manifests | |||
|
1030 | # unbundling: adding file changes | |||
|
1031 | # unbundling: added 1 changesets with 1 changes to 1 files | |||
|
1032 | # unbundling: (run 'hg update' to get a working copy) |
General Comments 0
You need to be logged in to leave comments.
Login now