Show More
| @@ -1,786 +1,802 b'' | |||
|
|
1 | 1 | ================================================== |
|
|
2 | 2 | Test obsmarkers interaction with bundle and strip |
|
|
3 | 3 | ================================================== |
|
|
4 | 4 | |
|
|
5 | 5 | The file currently only contains test for bundle. |
|
|
6 | 6 | Testing of strip will happen some time soon (tm). |
|
|
7 | 7 | |
|
|
8 | 8 | Setup a repository with various case |
|
|
9 | 9 | ==================================== |
|
|
10 | 10 | |
|
|
11 | 11 | Config setup |
|
|
12 | 12 | ------------ |
|
|
13 | 13 | |
|
|
14 | 14 | $ cat >> $HGRCPATH <<EOF |
|
|
15 | 15 | > [ui] |
|
|
16 | 16 | > # simpler log output |
|
|
17 | 17 | > logtemplate = "{node|short}: {desc}\n" |
|
|
18 | 18 | > |
|
|
19 | 19 | > [experimental] |
|
|
20 | 20 | > # enable evolution |
|
|
21 | 21 | > evolution = all |
|
|
22 | 22 | > |
|
|
23 | 23 | > # include obsmarkers in bundle |
|
|
24 | 24 | > evolution.bundle-obsmarker = yes |
|
|
25 | 25 | > |
|
|
26 | 26 | > [extensions] |
|
|
27 | 27 | > # needed for some tests |
|
|
28 | 28 | > strip = |
|
|
29 | 29 | > [defaults] |
|
|
30 | 30 | > # we'll query many hidden changeset |
|
|
31 | 31 | > debugobsolete = --hidden |
|
|
32 | 32 | > EOF |
|
|
33 | 33 | |
|
|
34 | 34 | $ mkcommit() { |
|
|
35 | 35 | > echo "$1" > "$1" |
|
|
36 | 36 | > hg add "$1" |
|
|
37 | 37 | > hg ci -m "$1" |
|
|
38 | 38 | > } |
|
|
39 | 39 | |
|
|
40 | 40 | $ getid() { |
|
|
41 | 41 | > hg log --hidden --template '{node}\n' --rev "$1" |
|
|
42 | 42 | > } |
|
|
43 | 43 | |
|
|
44 | 44 | $ mktestrepo () { |
|
|
45 | 45 | > [ -n "$1" ] || exit 1 |
|
|
46 | 46 | > cd $TESTTMP |
|
|
47 | 47 | > hg init $1 |
|
|
48 | 48 | > cd $1 |
|
|
49 | 49 | > mkcommit ROOT |
|
|
50 | 50 | > } |
|
|
51 | 51 | |
|
|
52 | 52 | Function to compare the expected bundled obsmarkers with the actually bundled |
|
|
53 | 53 | obsmarkers. |
|
|
54 | 54 | |
|
|
55 | 55 | $ testrevs () { |
|
|
56 | 56 | > revs="$1" |
|
|
57 | 57 | > testname=`basename \`pwd\`` |
|
|
58 | 58 | > revsname=`hg --hidden log -T '-{desc}\n' --rev "${revs}"` |
|
|
59 | 59 | > prefix="${TESTTMP}/${testname}${revsname}" |
|
|
60 | 60 | > markersfile="${prefix}-relevant-markers.txt" |
|
|
61 | 61 | > bundlefile="${prefix}-bundle.hg" |
|
|
62 | 62 | > contentfile="${prefix}-bundle-markers.hg" |
|
|
63 | 63 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" |
|
|
64 | 64 | > echo '### Matched revisions###' |
|
|
65 | 65 | > hg log --hidden --rev "${revs}" | sort |
|
|
66 | 66 | > echo '### Relevant markers ###' |
|
|
67 | 67 | > cat "${markersfile}" |
|
|
68 | 68 | > printf "# bundling: " |
|
|
69 | 69 | > hg bundle --hidden --base "parents(roots(${revs}))" --rev "${revs}" "${bundlefile}" |
|
|
70 | 70 | > hg debugbundle "${bundlefile}" | grep "obsmarkers --" -A 100 | sed 1,2d > "${contentfile}" |
|
|
71 | 71 | > echo '### Bundled markers ###' |
|
|
72 | 72 | > cat "${contentfile}" |
|
|
73 | 73 | > echo '### diff <relevant> <bundled> ###' |
|
|
74 | 74 | > cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}" |
|
|
75 | 75 | > echo '#################################' |
|
|
76 | 76 | > } |
|
|
77 | 77 | |
|
|
78 | 78 | root setup |
|
|
79 | 79 | ------------- |
|
|
80 | 80 | |
|
|
81 | 81 | simple chain |
|
|
82 | 82 | ============ |
|
|
83 | 83 | |
|
|
84 | 84 | . A0 |
|
|
85 | 85 | . ⇠ø⇠◔ A1 |
|
|
86 | 86 | . |/ |
|
|
87 | 87 | . ● |
|
|
88 | 88 | |
|
|
89 | 89 | setup |
|
|
90 | 90 | ----- |
|
|
91 | 91 | |
|
|
92 | 92 | $ mktestrepo simple-chain |
|
|
93 | 93 | $ mkcommit 'C-A0' |
|
|
94 | 94 | $ hg up 'desc("ROOT")' |
|
|
95 | 95 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
96 | 96 | $ mkcommit 'C-A1' |
|
|
97 | 97 | created new head |
|
|
98 | 98 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
|
99 | 99 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 |
|
|
100 | 100 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` |
|
|
101 | 101 | |
|
|
102 | 102 | $ hg up 'desc("ROOT")' |
|
|
103 | 103 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
104 | 104 | $ hg log --hidden -G |
|
|
105 | 105 | o cf2c22470d67: C-A1 |
|
|
106 | 106 | | |
|
|
107 | 107 | | x 84fcb0dfe17b: C-A0 |
|
|
108 | 108 | |/ |
|
|
109 | 109 | @ ea207398892e: ROOT |
|
|
110 | 110 | |
|
|
111 | 111 | $ hg debugobsolete |
|
|
112 | 112 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
113 | 113 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
114 | 114 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
115 | 115 | |
|
|
116 | 116 | Actual testing |
|
|
117 | 117 | -------------- |
|
|
118 | 118 | |
|
|
119 | 119 | $ testrevs 'desc("C-A0")' |
|
|
120 | 120 | ### Matched revisions### |
|
|
121 | 121 | 84fcb0dfe17b: C-A0 |
|
|
122 | 122 | ### Relevant markers ### |
|
|
123 | 123 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
124 | 124 | # bundling: 1 changesets found |
|
|
125 | 125 | ### Bundled markers ### |
|
|
126 | 126 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
127 | 127 | ### diff <relevant> <bundled> ### |
|
|
128 | 128 | ################################# |
|
|
129 | 129 | |
|
|
130 | 130 | $ testrevs 'desc("C-A1")' |
|
|
131 | 131 | ### Matched revisions### |
|
|
132 | 132 | cf2c22470d67: C-A1 |
|
|
133 | 133 | ### Relevant markers ### |
|
|
134 | 134 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
135 | 135 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
136 | 136 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
137 | 137 | # bundling: 1 changesets found |
|
|
138 | 138 | ### Bundled markers ### |
|
|
139 | 139 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
140 | 140 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
141 | 141 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
142 | 142 | ### diff <relevant> <bundled> ### |
|
|
143 | 143 | ################################# |
|
|
144 | 144 | |
|
|
145 | 145 | $ testrevs 'desc("C-A")' |
|
|
146 | 146 | ### Matched revisions### |
|
|
147 | 147 | 84fcb0dfe17b: C-A0 |
|
|
148 | 148 | cf2c22470d67: C-A1 |
|
|
149 | 149 | ### Relevant markers ### |
|
|
150 | 150 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
151 | 151 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
152 | 152 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
153 | 153 | # bundling: 2 changesets found |
|
|
154 | 154 | ### Bundled markers ### |
|
|
155 | 155 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
156 | 156 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
157 | 157 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
158 | 158 | ### diff <relevant> <bundled> ### |
|
|
159 | 159 | ################################# |
|
|
160 | 160 | |
|
|
161 | 161 | chain with prune children |
|
|
162 | 162 | ========================= |
|
|
163 | 163 | |
|
|
164 | 164 | . ⇠⊗ B0 |
|
|
165 | 165 | . | |
|
|
166 | 166 | . ⇠ø⇠◔ A1 |
|
|
167 | 167 | . | |
|
|
168 | 168 | . ● |
|
|
169 | 169 | |
|
|
170 | 170 | setup |
|
|
171 | 171 | ----- |
|
|
172 | 172 | |
|
|
173 | 173 | $ mktestrepo prune |
|
|
174 | 174 | $ mkcommit 'C-A0' |
|
|
175 | 175 | $ mkcommit 'C-B0' |
|
|
176 | 176 | $ hg up 'desc("ROOT")' |
|
|
177 | 177 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|
178 | 178 | $ mkcommit 'C-A1' |
|
|
179 | 179 | created new head |
|
|
180 | 180 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
|
181 | 181 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
|
182 | 182 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
|
183 | 183 | $ hg up 'desc("ROOT")' |
|
|
184 | 184 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
185 | 185 | $ hg log --hidden -G |
|
|
186 | 186 | o cf2c22470d67: C-A1 |
|
|
187 | 187 | | |
|
|
188 | 188 | | x 29f93b1df87b: C-B0 |
|
|
189 | 189 | | | |
|
|
190 | 190 | | x 84fcb0dfe17b: C-A0 |
|
|
191 | 191 | |/ |
|
|
192 | 192 | @ ea207398892e: ROOT |
|
|
193 | 193 | |
|
|
194 | 194 | $ hg debugobsolete |
|
|
195 | 195 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
196 | 196 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
197 | 197 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
198 | 198 | |
|
|
199 | 199 | Actual testing |
|
|
200 | 200 | -------------- |
|
|
201 | 201 | |
|
|
202 | 202 | $ testrevs 'desc("C-A0")' |
|
|
203 | 203 | ### Matched revisions### |
|
|
204 | 204 | 84fcb0dfe17b: C-A0 |
|
|
205 | 205 | ### Relevant markers ### |
|
|
206 | 206 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
207 | 207 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
208 | 208 | # bundling: 1 changesets found |
|
|
209 | 209 | ### Bundled markers ### |
|
|
210 | 210 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
211 | 211 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
212 | 212 | ### diff <relevant> <bundled> ### |
|
|
213 | 213 | ################################# |
|
|
214 | 214 | |
|
|
215 | 215 | $ testrevs 'desc("C-B0")' |
|
|
216 | 216 | ### Matched revisions### |
|
|
217 | 217 | 29f93b1df87b: C-B0 |
|
|
218 | 218 | ### Relevant markers ### |
|
|
219 | 219 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
220 | 220 | # bundling: 1 changesets found |
|
|
221 | 221 | ### Bundled markers ### |
|
|
222 | 222 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
223 | 223 | ### diff <relevant> <bundled> ### |
|
|
224 | 224 | ################################# |
|
|
225 | 225 | |
|
|
226 | 226 | $ testrevs 'desc("C-A1")' |
|
|
227 | 227 | ### Matched revisions### |
|
|
228 | 228 | cf2c22470d67: C-A1 |
|
|
229 | 229 | ### Relevant markers ### |
|
|
230 | 230 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
231 | 231 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
232 | 232 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
233 | 233 | # bundling: 1 changesets found |
|
|
234 | 234 | ### Bundled markers ### |
|
|
235 | 235 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
236 | 236 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
237 | 237 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
238 | 238 | ### diff <relevant> <bundled> ### |
|
|
239 | 239 | ################################# |
|
|
240 | 240 | |
|
|
241 | 241 | bundling multiple revisions |
|
|
242 | 242 | |
|
|
243 | 243 | $ testrevs 'desc("C-A")' |
|
|
244 | 244 | ### Matched revisions### |
|
|
245 | 245 | 84fcb0dfe17b: C-A0 |
|
|
246 | 246 | cf2c22470d67: C-A1 |
|
|
247 | 247 | ### Relevant markers ### |
|
|
248 | 248 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
249 | 249 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
250 | 250 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
251 | 251 | # bundling: 2 changesets found |
|
|
252 | 252 | ### Bundled markers ### |
|
|
253 | 253 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
254 | 254 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
255 | 255 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
256 | 256 | ### diff <relevant> <bundled> ### |
|
|
257 | 257 | ################################# |
|
|
258 | 258 | |
|
|
259 | 259 | $ testrevs 'desc("C-")' |
|
|
260 | 260 | ### Matched revisions### |
|
|
261 | 261 | 29f93b1df87b: C-B0 |
|
|
262 | 262 | 84fcb0dfe17b: C-A0 |
|
|
263 | 263 | cf2c22470d67: C-A1 |
|
|
264 | 264 | ### Relevant markers ### |
|
|
265 | 265 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
266 | 266 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
267 | 267 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
268 | 268 | # bundling: 3 changesets found |
|
|
269 | 269 | ### Bundled markers ### |
|
|
270 | 270 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
271 | 271 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
272 | 272 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
273 | 273 | ### diff <relevant> <bundled> ### |
|
|
274 | 274 | ################################# |
|
|
275 | 275 | |
|
|
276 | 276 | chain with precursors also pruned |
|
|
277 | 277 | ================================= |
|
|
278 | 278 | |
|
|
279 | 279 | . A0 (also pruned) |
|
|
280 | 280 | . ⇠ø⇠◔ A1 |
|
|
281 | 281 | . | |
|
|
282 | 282 | . ● |
|
|
283 | 283 | |
|
|
284 | 284 | setup |
|
|
285 | 285 | ----- |
|
|
286 | 286 | |
|
|
287 | 287 | $ mktestrepo prune-inline |
|
|
288 | 288 | $ mkcommit 'C-A0' |
|
|
289 | 289 | $ hg up 'desc("ROOT")' |
|
|
290 | 290 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
291 | 291 | $ mkcommit 'C-A1' |
|
|
292 | 292 | created new head |
|
|
293 | 293 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
|
294 | 294 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
|
295 | 295 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
|
296 | 296 | $ hg up 'desc("ROOT")' |
|
|
297 | 297 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
298 | 298 | $ hg log --hidden -G |
|
|
299 | 299 | o cf2c22470d67: C-A1 |
|
|
300 | 300 | | |
|
|
301 | 301 | | x 84fcb0dfe17b: C-A0 |
|
|
302 | 302 | |/ |
|
|
303 | 303 | @ ea207398892e: ROOT |
|
|
304 | 304 | |
|
|
305 | 305 | $ hg debugobsolete |
|
|
306 | 306 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
307 | 307 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
308 | 308 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
309 | 309 | |
|
|
310 | 310 | Actual testing |
|
|
311 | 311 | -------------- |
|
|
312 | 312 | |
|
|
313 | 313 | $ testrevs 'desc("C-A0")' |
|
|
314 | 314 | ### Matched revisions### |
|
|
315 | 315 | 84fcb0dfe17b: C-A0 |
|
|
316 | 316 | ### Relevant markers ### |
|
|
317 | 317 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
318 | 318 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
319 | 319 | # bundling: 1 changesets found |
|
|
320 | 320 | ### Bundled markers ### |
|
|
321 | 321 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
322 | 322 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
323 | 323 | ### diff <relevant> <bundled> ### |
|
|
324 | 324 | ################################# |
|
|
325 | 325 | |
|
|
326 | 326 | $ testrevs 'desc("C-A1")' |
|
|
327 | 327 | ### Matched revisions### |
|
|
328 | 328 | cf2c22470d67: C-A1 |
|
|
329 | 329 | ### Relevant markers ### |
|
|
330 | 330 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
331 | 331 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
332 | 332 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
333 | 333 | # bundling: 1 changesets found |
|
|
334 | 334 | ### Bundled markers ### |
|
|
335 | 335 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
336 | 336 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
337 | 337 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
338 | 338 | ### diff <relevant> <bundled> ### |
|
|
339 | 339 | ################################# |
|
|
340 | 340 | |
|
|
341 | 341 | $ testrevs 'desc("C-A")' |
|
|
342 | 342 | ### Matched revisions### |
|
|
343 | 343 | 84fcb0dfe17b: C-A0 |
|
|
344 | 344 | cf2c22470d67: C-A1 |
|
|
345 | 345 | ### Relevant markers ### |
|
|
346 | 346 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
347 | 347 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
348 | 348 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
349 | 349 | # bundling: 2 changesets found |
|
|
350 | 350 | ### Bundled markers ### |
|
|
351 | 351 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
352 | 352 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
353 | 353 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
354 | 354 | ### diff <relevant> <bundled> ### |
|
|
355 | 355 | ################################# |
|
|
356 | 356 | |
|
|
357 | 357 | chain with missing prune |
|
|
358 | 358 | ======================== |
|
|
359 | 359 | |
|
|
360 | 360 | . ⊗ B |
|
|
361 | 361 | . | |
|
|
362 | 362 | . ⇠◌⇠◔ A1 |
|
|
363 | 363 | . | |
|
|
364 | 364 | . ● |
|
|
365 | 365 | |
|
|
366 | 366 | setup |
|
|
367 | 367 | ----- |
|
|
368 | 368 | |
|
|
369 | 369 | $ mktestrepo missing-prune |
|
|
370 | 370 | $ mkcommit 'C-A0' |
|
|
371 | 371 | $ mkcommit 'C-B0' |
|
|
372 | 372 | $ hg up 'desc("ROOT")' |
|
|
373 | 373 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|
374 | 374 | $ mkcommit 'C-A1' |
|
|
375 | 375 | created new head |
|
|
376 | 376 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
|
377 | 377 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
|
378 | 378 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
|
379 | 379 | |
|
|
380 | 380 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
|
381 | 381 | |
|
|
382 | 382 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
|
|
383 | 383 | |
|
|
384 | 384 | $ hg up 'desc("ROOT")' |
|
|
385 | 385 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
386 | 386 | $ hg log --hidden -G |
|
|
387 | 387 | o cf2c22470d67: C-A1 |
|
|
388 | 388 | | |
|
|
389 | 389 | @ ea207398892e: ROOT |
|
|
390 | 390 | |
|
|
391 | 391 | $ hg debugobsolete |
|
|
392 | 392 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
393 | 393 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
394 | 394 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
395 | 395 | |
|
|
396 | 396 | Actual testing |
|
|
397 | 397 | -------------- |
|
|
398 | 398 | |
|
|
399 | 399 | $ testrevs 'desc("C-A1")' |
|
|
400 | 400 | ### Matched revisions### |
|
|
401 | 401 | cf2c22470d67: C-A1 |
|
|
402 | 402 | ### Relevant markers ### |
|
|
403 | 403 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
404 | 404 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
405 | 405 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
406 | 406 | # bundling: 1 changesets found |
|
|
407 | 407 | ### Bundled markers ### |
|
|
408 | 408 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
409 | 409 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
410 | 410 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
411 | 411 | ### diff <relevant> <bundled> ### |
|
|
412 | 412 | ################################# |
|
|
413 | 413 | |
|
|
414 | 414 | chain with precursors also pruned |
|
|
415 | 415 | ================================= |
|
|
416 | 416 | |
|
|
417 | 417 | . A0 (also pruned) |
|
|
418 | 418 | . ⇠◌⇠◔ A1 |
|
|
419 | 419 | . | |
|
|
420 | 420 | . ● |
|
|
421 | 421 | |
|
|
422 | 422 | setup |
|
|
423 | 423 | ----- |
|
|
424 | 424 | |
|
|
425 | 425 | $ mktestrepo prune-inline-missing |
|
|
426 | 426 | $ mkcommit 'C-A0' |
|
|
427 | 427 | $ hg up 'desc("ROOT")' |
|
|
428 | 428 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
429 | 429 | $ mkcommit 'C-A1' |
|
|
430 | 430 | created new head |
|
|
431 | 431 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
|
432 | 432 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
|
433 | 433 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
|
434 | 434 | |
|
|
435 | 435 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
|
436 | 436 | |
|
|
437 | 437 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
|
|
438 | 438 | |
|
|
439 | 439 | $ hg up 'desc("ROOT")' |
|
|
440 | 440 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
441 | 441 | $ hg log --hidden -G |
|
|
442 | 442 | o cf2c22470d67: C-A1 |
|
|
443 | 443 | | |
|
|
444 | 444 | @ ea207398892e: ROOT |
|
|
445 | 445 | |
|
|
446 | 446 | $ hg debugobsolete |
|
|
447 | 447 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
448 | 448 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
449 | 449 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
450 | 450 | |
|
|
451 | 451 | Actual testing |
|
|
452 | 452 | -------------- |
|
|
453 | 453 | |
|
|
454 | 454 | $ testrevs 'desc("C-A1")' |
|
|
455 | 455 | ### Matched revisions### |
|
|
456 | 456 | cf2c22470d67: C-A1 |
|
|
457 | 457 | ### Relevant markers ### |
|
|
458 | 458 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
459 | 459 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
460 | 460 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
461 | 461 | # bundling: 1 changesets found |
|
|
462 | 462 | ### Bundled markers ### |
|
|
463 | 463 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
464 | 464 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
465 | 465 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
466 | 466 | ### diff <relevant> <bundled> ### |
|
|
467 | 467 | ################################# |
|
|
468 | 468 | |
|
|
469 | 469 | Chain with fold and split |
|
|
470 | 470 | ========================= |
|
|
471 | 471 | |
|
|
472 | 472 | setup |
|
|
473 | 473 | ----- |
|
|
474 | 474 | |
|
|
475 | 475 | $ mktestrepo split-fold |
|
|
476 | 476 | $ mkcommit 'C-A' |
|
|
477 | 477 | $ hg up 'desc("ROOT")' |
|
|
478 | 478 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
479 | 479 | $ mkcommit 'C-B' |
|
|
480 | 480 | created new head |
|
|
481 | 481 | $ hg up 'desc("ROOT")' |
|
|
482 | 482 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
483 | 483 | $ mkcommit 'C-C' |
|
|
484 | 484 | created new head |
|
|
485 | 485 | $ hg up 'desc("ROOT")' |
|
|
486 | 486 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
487 | 487 | $ mkcommit 'C-D' |
|
|
488 | 488 | created new head |
|
|
489 | 489 | $ hg up 'desc("ROOT")' |
|
|
490 | 490 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
491 | 491 | $ mkcommit 'C-E' |
|
|
492 | 492 | created new head |
|
|
493 | 493 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` |
|
|
494 | 494 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split |
|
|
495 | 495 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
|
|
496 | 496 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 |
|
|
497 | 497 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` |
|
|
498 | 498 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` |
|
|
499 | 499 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` |
|
|
500 | 500 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` |
|
|
501 | 501 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` |
|
|
502 | 502 | |
|
|
503 | 503 | $ hg up 'desc("ROOT")' |
|
|
504 | 504 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
505 | 505 | $ hg log --hidden -G |
|
|
506 | 506 | o 2f20ff6509f0: C-E |
|
|
507 | 507 | | |
|
|
508 | 508 | | x 06dc9da25ef0: C-D |
|
|
509 | 509 | |/ |
|
|
510 | 510 | | x 27ec657ca21d: C-C |
|
|
511 | 511 | |/ |
|
|
512 | 512 | | x a9b9da38ed96: C-B |
|
|
513 | 513 | |/ |
|
|
514 | 514 | | x 9ac430e15fca: C-A |
|
|
515 | 515 | |/ |
|
|
516 | 516 | @ ea207398892e: ROOT |
|
|
517 | 517 | |
|
|
518 | 518 | $ hg debugobsolete |
|
|
519 | 519 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
520 | 520 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
521 | 521 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
522 | 522 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
523 | 523 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
524 | 524 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
525 | 525 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
526 | 526 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
527 | 527 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
528 | 528 | |
|
|
529 | 529 | Actual testing |
|
|
530 | 530 | -------------- |
|
|
531 | 531 | |
|
|
532 | 532 | $ testrevs 'desc("C-A")' |
|
|
533 | 533 | ### Matched revisions### |
|
|
534 | 534 | 9ac430e15fca: C-A |
|
|
535 | 535 | ### Relevant markers ### |
|
|
536 | 536 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
537 | 537 | # bundling: 1 changesets found |
|
|
538 | 538 | ### Bundled markers ### |
|
|
539 | 539 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
540 | 540 | ### diff <relevant> <bundled> ### |
|
|
541 | 541 | ################################# |
|
|
542 | 542 | |
|
|
543 | 543 | $ testrevs 'desc("C-B")' |
|
|
544 | 544 | ### Matched revisions### |
|
|
545 | 545 | a9b9da38ed96: C-B |
|
|
546 | 546 | ### Relevant markers ### |
|
|
547 | 547 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
548 | 548 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
549 | 549 | # bundling: 1 changesets found |
|
|
550 | 550 | ### Bundled markers ### |
|
|
551 | 551 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
552 | 552 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
553 | 553 | ### diff <relevant> <bundled> ### |
|
|
554 | 554 | ################################# |
|
|
555 | 555 | |
|
|
556 | 556 | $ testrevs 'desc("C-C")' |
|
|
557 | 557 | ### Matched revisions### |
|
|
558 | 558 | 27ec657ca21d: C-C |
|
|
559 | 559 | ### Relevant markers ### |
|
|
560 | 560 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
561 | 561 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
562 | 562 | # bundling: 1 changesets found |
|
|
563 | 563 | ### Bundled markers ### |
|
|
564 | 564 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
565 | 565 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
566 | 566 | ### diff <relevant> <bundled> ### |
|
|
567 | 567 | ################################# |
|
|
568 | 568 | |
|
|
569 | 569 | $ testrevs 'desc("C-D")' |
|
|
570 | 570 | ### Matched revisions### |
|
|
571 | 571 | 06dc9da25ef0: C-D |
|
|
572 | 572 | ### Relevant markers ### |
|
|
573 | 573 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
574 | 574 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
575 | 575 | # bundling: 1 changesets found |
|
|
576 | 576 | ### Bundled markers ### |
|
|
577 | 577 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
578 | 578 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
579 | 579 | ### diff <relevant> <bundled> ### |
|
|
580 | 580 | ################################# |
|
|
581 | 581 | |
|
|
582 | 582 | $ testrevs 'desc("C-E")' |
|
|
583 | 583 | ### Matched revisions### |
|
|
584 | 584 | 2f20ff6509f0: C-E |
|
|
585 | 585 | ### Relevant markers ### |
|
|
586 | 586 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
587 | 587 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
588 | 588 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
589 | 589 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
590 | 590 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
591 | 591 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
592 | 592 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
593 | 593 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
594 | 594 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
595 | 595 | # bundling: 1 changesets found |
|
|
596 | 596 | ### Bundled markers ### |
|
|
597 | 597 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
598 | 598 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
599 | 599 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
600 | 600 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
601 | 601 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
602 | 602 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
603 | 603 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
604 | 604 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
605 | 605 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
606 | 606 | ### diff <relevant> <bundled> ### |
|
|
607 | 607 | ################################# |
|
|
608 | 608 | |
|
|
609 | 609 | Bundle multiple revisions |
|
|
610 | 610 | |
|
|
611 | 611 | * each part of the split |
|
|
612 | 612 | |
|
|
613 | 613 | $ testrevs 'desc("C-B") + desc("C-C")' |
|
|
614 | 614 | ### Matched revisions### |
|
|
615 | 615 | 27ec657ca21d: C-C |
|
|
616 | 616 | a9b9da38ed96: C-B |
|
|
617 | 617 | ### Relevant markers ### |
|
|
618 | 618 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
619 | 619 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
620 | 620 | # bundling: 2 changesets found |
|
|
621 | 621 | ### Bundled markers ### |
|
|
622 | 622 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
623 | 623 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
624 | 624 | ### diff <relevant> <bundled> ### |
|
|
625 | 625 | ################################# |
|
|
626 | 626 | |
|
|
627 | 627 | * top one and other divergent |
|
|
628 | 628 | |
|
|
629 | 629 | $ testrevs 'desc("C-E") + desc("C-D")' |
|
|
630 | 630 | ### Matched revisions### |
|
|
631 | 631 | 06dc9da25ef0: C-D |
|
|
632 | 632 | 2f20ff6509f0: C-E |
|
|
633 | 633 | ### Relevant markers ### |
|
|
634 | 634 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
635 | 635 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
636 | 636 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
637 | 637 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
638 | 638 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
639 | 639 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
640 | 640 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
641 | 641 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
642 | 642 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
643 | 643 | # bundling: 2 changesets found |
|
|
644 | 644 | ### Bundled markers ### |
|
|
645 | 645 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
646 | 646 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
647 | 647 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
648 | 648 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
649 | 649 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
650 | 650 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
651 | 651 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
652 | 652 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
653 | 653 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
654 | 654 | ### diff <relevant> <bundled> ### |
|
|
655 | 655 | ################################# |
|
|
656 | 656 | |
|
|
657 | 657 | * top one and initial precursors |
|
|
658 | 658 | |
|
|
659 | 659 | $ testrevs 'desc("C-E") + desc("C-A")' |
|
|
660 | 660 | ### Matched revisions### |
|
|
661 | 661 | 2f20ff6509f0: C-E |
|
|
662 | 662 | 9ac430e15fca: C-A |
|
|
663 | 663 | ### Relevant markers ### |
|
|
664 | 664 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
665 | 665 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
666 | 666 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
667 | 667 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
668 | 668 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
669 | 669 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
670 | 670 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
671 | 671 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
672 | 672 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
673 | 673 | # bundling: 2 changesets found |
|
|
674 | 674 | ### Bundled markers ### |
|
|
675 | 675 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
676 | 676 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
677 | 677 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
678 | 678 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
679 | 679 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
680 | 680 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
681 | 681 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
682 | 682 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
683 | 683 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
684 | 684 | ### diff <relevant> <bundled> ### |
|
|
685 | 685 | ################################# |
|
|
686 | 686 | |
|
|
687 | 687 | * top one and one of the split |
|
|
688 | 688 | |
|
|
689 | 689 | $ testrevs 'desc("C-E") + desc("C-C")' |
|
|
690 | 690 | ### Matched revisions### |
|
|
691 | 691 | 27ec657ca21d: C-C |
|
|
692 | 692 | 2f20ff6509f0: C-E |
|
|
693 | 693 | ### Relevant markers ### |
|
|
694 | 694 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
695 | 695 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
696 | 696 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
697 | 697 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
698 | 698 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
699 | 699 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
700 | 700 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
701 | 701 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
702 | 702 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
703 | 703 | # bundling: 2 changesets found |
|
|
704 | 704 | ### Bundled markers ### |
|
|
705 | 705 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
706 | 706 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
707 | 707 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
708 | 708 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
709 | 709 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
710 | 710 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
711 | 711 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
712 | 712 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
713 | 713 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
714 | 714 | ### diff <relevant> <bundled> ### |
|
|
715 | 715 | ################################# |
|
|
716 | 716 | |
|
|
717 | 717 | * all |
|
|
718 | 718 | |
|
|
719 | 719 | $ testrevs 'desc("C-")' |
|
|
720 | 720 | ### Matched revisions### |
|
|
721 | 721 | 06dc9da25ef0: C-D |
|
|
722 | 722 | 27ec657ca21d: C-C |
|
|
723 | 723 | 2f20ff6509f0: C-E |
|
|
724 | 724 | 9ac430e15fca: C-A |
|
|
725 | 725 | a9b9da38ed96: C-B |
|
|
726 | 726 | ### Relevant markers ### |
|
|
727 | 727 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
728 | 728 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
729 | 729 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
730 | 730 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
731 | 731 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
732 | 732 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
733 | 733 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
734 | 734 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
735 | 735 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
736 | 736 | # bundling: 5 changesets found |
|
|
737 | 737 | ### Bundled markers ### |
|
|
738 | 738 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
739 | 739 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
740 | 740 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
741 | 741 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
742 | 742 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
743 | 743 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
744 | 744 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
745 | 745 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
746 | 746 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
747 | 747 | ### diff <relevant> <bundled> ### |
|
|
748 | 748 | ################################# |
|
|
749 | 749 | |
|
|
750 | 750 | changeset pruned on its own |
|
|
751 | 751 | =========================== |
|
|
752 | 752 | |
|
|
753 | 753 | . ⊗ B |
|
|
754 | 754 | . | |
|
|
755 | 755 | . ◕ A |
|
|
756 | 756 | . | |
|
|
757 | 757 | . ● |
|
|
758 | 758 | |
|
|
759 | 759 | setup |
|
|
760 | 760 | ----- |
|
|
761 | 761 | |
|
|
762 | 762 | $ mktestrepo lonely-prune |
|
|
763 | 763 | $ hg up 'desc("ROOT")' |
|
|
764 | 764 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
765 | 765 | $ mkcommit 'C-A' |
|
|
766 | 766 | $ mkcommit 'C-B' |
|
|
767 | 767 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` |
|
|
768 | 768 | |
|
|
769 | 769 | $ hg up 'desc("ROOT")' |
|
|
770 | 770 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|
771 | 771 | $ hg log --hidden -G |
|
|
772 | 772 | x cefb651fc2fd: C-B |
|
|
773 | 773 | | |
|
|
774 | 774 | o 9ac430e15fca: C-A |
|
|
775 | 775 | | |
|
|
776 | 776 | @ ea207398892e: ROOT |
|
|
777 | 777 | |
|
|
778 | 778 | $ hg debugobsolete |
|
|
779 | 779 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
|
780 | 780 | |
|
|
781 | 781 | Actual testing |
|
|
782 | 782 | -------------- |
|
|
783 |
$ |
|
|
|
784 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
785 | $ hg debugobsolete --hidden --rev 'desc("C-B")' | |
|
|
786 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
783 | $ testrevs 'desc("C-A")' | |
|
|
784 | ### Matched revisions### | |
|
|
785 | 9ac430e15fca: C-A | |
|
|
786 | ### Relevant markers ### | |
|
|
787 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
788 | # bundling: 1 changesets found | |
|
|
789 | ### Bundled markers ### | |
|
|
790 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
791 | ### diff <relevant> <bundled> ### | |
|
|
792 | ################################# | |
|
|
793 | $ testrevs 'desc("C-B")' | |
|
|
794 | ### Matched revisions### | |
|
|
795 | cefb651fc2fd: C-B | |
|
|
796 | ### Relevant markers ### | |
|
|
797 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
798 | # bundling: 1 changesets found | |
|
|
799 | ### Bundled markers ### | |
|
|
800 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
|
801 | ### diff <relevant> <bundled> ### | |
|
|
802 | ################################# | |
General Comments 0
You need to be logged in to leave comments.
Login now