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