Show More
@@ -1,413 +1,470 b'' | |||||
1 | ================================================== |
|
1 | ================================================== | |
2 | Test obsmarkers interaction with bundle and strip |
|
2 | Test obsmarkers interaction with bundle and strip | |
3 | ================================================== |
|
3 | ================================================== | |
4 |
|
4 | |||
5 | In practice, this file does not yet contains any tests for bundle and strip. |
|
5 | The file currently only contains test for bundle. | |
6 |
|
|
6 | Testing of strip will happen some time soon (tm). | |
7 |
|
||||
8 | For now this test check the logic computing markers relevant to a set of |
|
|||
9 | revision. That logic will be use by "hg bundle" to select the markers to |
|
|||
10 | include, and strip to find the markers to backup. |
|
|||
11 |
|
7 | |||
12 | Setup a repository with various case |
|
8 | Setup a repository with various case | |
13 | ==================================== |
|
9 | ==================================== | |
14 |
|
10 | |||
15 | Config setup |
|
11 | Config setup | |
16 | ------------ |
|
12 | ------------ | |
17 |
|
13 | |||
18 | $ cat >> $HGRCPATH <<EOF |
|
14 | $ cat >> $HGRCPATH <<EOF | |
19 | > [ui] |
|
15 | > [ui] | |
20 | > # simpler log output |
|
16 | > # simpler log output | |
21 | > logtemplate = "{node|short}: {desc}\n" |
|
17 | > logtemplate = "{node|short}: {desc}\n" | |
22 | > |
|
18 | > | |
23 | > [experimental] |
|
19 | > [experimental] | |
24 | > # enable evolution |
|
20 | > # enable evolution | |
25 | > evolution = all |
|
21 | > evolution = all | |
26 | > |
|
22 | > | |
27 | > # include obsmarkers in bundle |
|
23 | > # include obsmarkers in bundle | |
28 | > evolution.bundle-obsmarker = yes |
|
24 | > evolution.bundle-obsmarker = yes | |
29 | > |
|
25 | > | |
30 | > [extensions] |
|
26 | > [extensions] | |
31 | > # needed for some tests |
|
27 | > # needed for some tests | |
32 | > strip = |
|
28 | > strip = | |
33 | > [defaults] |
|
29 | > [defaults] | |
34 | > # we'll query many hidden changeset |
|
30 | > # we'll query many hidden changeset | |
35 | > debugobsolete = --hidden |
|
31 | > debugobsolete = --hidden | |
36 | > EOF |
|
32 | > EOF | |
37 |
|
33 | |||
38 | $ mkcommit() { |
|
34 | $ mkcommit() { | |
39 | > echo "$1" > "$1" |
|
35 | > echo "$1" > "$1" | |
40 | > hg add "$1" |
|
36 | > hg add "$1" | |
41 | > hg ci -m "$1" |
|
37 | > hg ci -m "$1" | |
42 | > } |
|
38 | > } | |
43 |
|
39 | |||
44 | $ getid() { |
|
40 | $ getid() { | |
45 | > hg log --hidden --template '{node}\n' --rev "$1" |
|
41 | > hg log --hidden --template '{node}\n' --rev "$1" | |
46 | > } |
|
42 | > } | |
47 |
|
43 | |||
48 | $ mktestrepo () { |
|
44 | $ mktestrepo () { | |
49 | > [ -n "$1" ] || exit 1 |
|
45 | > [ -n "$1" ] || exit 1 | |
50 | > cd $TESTTMP |
|
46 | > cd $TESTTMP | |
51 | > hg init $1 |
|
47 | > hg init $1 | |
52 | > cd $1 |
|
48 | > cd $1 | |
53 | > mkcommit ROOT |
|
49 | > mkcommit ROOT | |
54 | > } |
|
50 | > } | |
55 |
|
51 | |||
|
52 | Function to compare the expected bundled obsmarkers with the actually bundled | |||
|
53 | obsmarkers. | |||
|
54 | ||||
|
55 | $ testrevs () { | |||
|
56 | > revs="$1" | |||
|
57 | > testname=`basename \`pwd\`` | |||
|
58 | > revsname=`hg --hidden log -T '-{desc}\n' --rev "${revs}"` | |||
|
59 | > prefix="${TESTTMP}/${testname}${revsname}" | |||
|
60 | > markersfile="${prefix}-relevant-markers.txt" | |||
|
61 | > bundlefile="${prefix}-bundle.hg" | |||
|
62 | > contentfile="${prefix}-bundle-markers.hg" | |||
|
63 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" | |||
|
64 | > echo '### Matched revisions###' | |||
|
65 | > hg log --hidden --rev "${revs}" | sort | |||
|
66 | > echo '### Relevant markers ###' | |||
|
67 | > cat "${markersfile}" | |||
|
68 | > printf "# bundling: " | |||
|
69 | > hg bundle --hidden --base "parents(roots(${revs}))" --rev "${revs}" "${bundlefile}" | |||
|
70 | > hg debugbundle "${bundlefile}" | grep "obsmarkers --" -A 100 | sed 1,2d > "${contentfile}" | |||
|
71 | > echo '### Bundled markers ###' | |||
|
72 | > cat "${contentfile}" | |||
|
73 | > echo '### diff <relevant> <bundled> ###' | |||
|
74 | > cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}" | |||
|
75 | > echo '#################################' | |||
|
76 | > } | |||
|
77 | ||||
56 | root setup |
|
78 | root setup | |
57 | ------------- |
|
79 | ------------- | |
58 |
|
80 | |||
59 | simple chain |
|
81 | simple chain | |
60 | ============ |
|
82 | ============ | |
61 |
|
83 | |||
62 | . A0 |
|
84 | . A0 | |
63 | . ⇠ø⇠◔ A1 |
|
85 | . ⇠ø⇠◔ A1 | |
64 | . |/ |
|
86 | . |/ | |
65 | . ● |
|
87 | . ● | |
66 |
|
88 | |||
67 | setup |
|
89 | setup | |
68 | ----- |
|
90 | ----- | |
69 |
|
91 | |||
70 | $ mktestrepo simple-chain |
|
92 | $ mktestrepo simple-chain | |
71 | $ mkcommit 'C-A0' |
|
93 | $ mkcommit 'C-A0' | |
72 | $ hg up 'desc("ROOT")' |
|
94 | $ hg up 'desc("ROOT")' | |
73 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
95 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
74 | $ mkcommit 'C-A1' |
|
96 | $ mkcommit 'C-A1' | |
75 | created new head |
|
97 | created new head | |
76 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
98 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
77 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 |
|
99 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 | |
78 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` |
|
100 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` | |
79 |
|
101 | |||
80 | $ hg up 'desc("ROOT")' |
|
102 | $ hg up 'desc("ROOT")' | |
81 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
103 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
82 | $ hg log --hidden -G |
|
104 | $ hg log --hidden -G | |
83 | o cf2c22470d67: C-A1 |
|
105 | o cf2c22470d67: C-A1 | |
84 | | |
|
106 | | | |
85 | | x 84fcb0dfe17b: C-A0 |
|
107 | | x 84fcb0dfe17b: C-A0 | |
86 | |/ |
|
108 | |/ | |
87 | @ ea207398892e: ROOT |
|
109 | @ ea207398892e: ROOT | |
88 |
|
110 | |||
89 | $ hg debugobsolete |
|
111 | $ hg debugobsolete | |
90 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
112 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
91 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
113 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
92 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
114 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
93 |
|
115 | |||
94 | Actual testing |
|
116 | Actual testing | |
95 | -------------- |
|
117 | -------------- | |
96 |
|
118 | |||
97 |
$ |
|
119 | $ testrevs 'desc("C-A0")' | |
98 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
120 | ### Matched revisions### | |
99 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
121 | 84fcb0dfe17b: C-A0 | |
100 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
122 | ### Relevant markers ### | |
101 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
123 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
102 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
124 | # bundling: 1 changesets found | |
|
125 | ### Bundled markers ### | |||
|
126 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
127 | ### diff <relevant> <bundled> ### | |||
|
128 | ################################# | |||
|
129 | ||||
|
130 | $ testrevs 'desc("C-A1")' | |||
|
131 | ### Matched revisions### | |||
|
132 | cf2c22470d67: C-A1 | |||
|
133 | ### Relevant markers ### | |||
|
134 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
135 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
136 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
137 | # bundling: 1 changesets found | |||
|
138 | ### Bundled markers ### | |||
|
139 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
140 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
141 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
142 | ### diff <relevant> <bundled> ### | |||
|
143 | ################################# | |||
|
144 | ||||
|
145 | $ testrevs 'desc("C-A")' | |||
|
146 | ### Matched revisions### | |||
|
147 | 84fcb0dfe17b: C-A0 | |||
|
148 | cf2c22470d67: C-A1 | |||
|
149 | ### Relevant markers ### | |||
|
150 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
151 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
152 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
153 | # bundling: 2 changesets found | |||
|
154 | ### Bundled markers ### | |||
|
155 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
156 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
157 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
158 | ### diff <relevant> <bundled> ### | |||
|
159 | ################################# | |||
103 |
|
160 | |||
104 | chain with prune children |
|
161 | chain with prune children | |
105 | ========================= |
|
162 | ========================= | |
106 |
|
163 | |||
107 | . ⇠⊗ B0 |
|
164 | . ⇠⊗ B0 | |
108 | . | |
|
165 | . | | |
109 | . ⇠ø⇠◔ A1 |
|
166 | . ⇠ø⇠◔ A1 | |
110 | . | |
|
167 | . | | |
111 | . ● |
|
168 | . ● | |
112 |
|
169 | |||
113 | setup |
|
170 | setup | |
114 | ----- |
|
171 | ----- | |
115 |
|
172 | |||
116 | $ mktestrepo prune |
|
173 | $ mktestrepo prune | |
117 | $ mkcommit 'C-A0' |
|
174 | $ mkcommit 'C-A0' | |
118 | $ mkcommit 'C-B0' |
|
175 | $ mkcommit 'C-B0' | |
119 | $ hg up 'desc("ROOT")' |
|
176 | $ hg up 'desc("ROOT")' | |
120 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
177 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
121 | $ mkcommit 'C-A1' |
|
178 | $ mkcommit 'C-A1' | |
122 | created new head |
|
179 | created new head | |
123 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
180 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
124 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
181 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
125 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
182 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
126 | $ hg up 'desc("ROOT")' |
|
183 | $ hg up 'desc("ROOT")' | |
127 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
184 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
128 | $ hg log --hidden -G |
|
185 | $ hg log --hidden -G | |
129 | o cf2c22470d67: C-A1 |
|
186 | o cf2c22470d67: C-A1 | |
130 | | |
|
187 | | | |
131 | | x 29f93b1df87b: C-B0 |
|
188 | | x 29f93b1df87b: C-B0 | |
132 | | | |
|
189 | | | | |
133 | | x 84fcb0dfe17b: C-A0 |
|
190 | | x 84fcb0dfe17b: C-A0 | |
134 | |/ |
|
191 | |/ | |
135 | @ ea207398892e: ROOT |
|
192 | @ ea207398892e: ROOT | |
136 |
|
193 | |||
137 | $ hg debugobsolete |
|
194 | $ hg debugobsolete | |
138 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
195 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
139 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
196 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
140 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
197 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
141 |
|
198 | |||
142 | Actual testing |
|
199 | Actual testing | |
143 | -------------- |
|
200 | -------------- | |
144 |
|
201 | |||
145 | $ hg debugobsolete --rev 'desc("C-A0")' |
|
202 | $ hg debugobsolete --rev 'desc("C-A0")' | |
146 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
203 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
147 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
204 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
148 | $ hg debugobsolete --rev 'desc("C-B0")' |
|
205 | $ hg debugobsolete --rev 'desc("C-B0")' | |
149 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
206 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
150 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
207 | $ hg debugobsolete --rev 'desc("C-A1")' | |
151 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
208 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
152 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
209 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
153 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
210 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
154 |
|
211 | |||
155 | chain with precursors also pruned |
|
212 | chain with precursors also pruned | |
156 | ================================= |
|
213 | ================================= | |
157 |
|
214 | |||
158 | . A0 (also pruned) |
|
215 | . A0 (also pruned) | |
159 | . ⇠ø⇠◔ A1 |
|
216 | . ⇠ø⇠◔ A1 | |
160 | . | |
|
217 | . | | |
161 | . ● |
|
218 | . ● | |
162 |
|
219 | |||
163 | setup |
|
220 | setup | |
164 | ----- |
|
221 | ----- | |
165 |
|
222 | |||
166 | $ mktestrepo prune-inline |
|
223 | $ mktestrepo prune-inline | |
167 | $ mkcommit 'C-A0' |
|
224 | $ mkcommit 'C-A0' | |
168 | $ hg up 'desc("ROOT")' |
|
225 | $ hg up 'desc("ROOT")' | |
169 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
226 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
170 | $ mkcommit 'C-A1' |
|
227 | $ mkcommit 'C-A1' | |
171 | created new head |
|
228 | created new head | |
172 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
229 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
173 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
230 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
174 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
231 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
175 | $ hg up 'desc("ROOT")' |
|
232 | $ hg up 'desc("ROOT")' | |
176 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
233 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
177 | $ hg log --hidden -G |
|
234 | $ hg log --hidden -G | |
178 | o cf2c22470d67: C-A1 |
|
235 | o cf2c22470d67: C-A1 | |
179 | | |
|
236 | | | |
180 | | x 84fcb0dfe17b: C-A0 |
|
237 | | x 84fcb0dfe17b: C-A0 | |
181 | |/ |
|
238 | |/ | |
182 | @ ea207398892e: ROOT |
|
239 | @ ea207398892e: ROOT | |
183 |
|
240 | |||
184 | $ hg debugobsolete |
|
241 | $ hg debugobsolete | |
185 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
242 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
186 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
243 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
187 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
244 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
188 |
|
245 | |||
189 | Actual testing |
|
246 | Actual testing | |
190 | -------------- |
|
247 | -------------- | |
191 |
|
248 | |||
192 | $ hg debugobsolete --rev 'desc("C-A0")' |
|
249 | $ hg debugobsolete --rev 'desc("C-A0")' | |
193 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
250 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
194 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
251 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
195 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
252 | $ hg debugobsolete --rev 'desc("C-A1")' | |
196 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
253 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
197 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
254 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
198 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
255 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
199 |
|
256 | |||
200 | chain with missing prune |
|
257 | chain with missing prune | |
201 | ======================== |
|
258 | ======================== | |
202 |
|
259 | |||
203 | . ⊗ B |
|
260 | . ⊗ B | |
204 | . | |
|
261 | . | | |
205 | . ⇠◌⇠◔ A1 |
|
262 | . ⇠◌⇠◔ A1 | |
206 | . | |
|
263 | . | | |
207 | . ● |
|
264 | . ● | |
208 |
|
265 | |||
209 | setup |
|
266 | setup | |
210 | ----- |
|
267 | ----- | |
211 |
|
268 | |||
212 | $ mktestrepo missing-prune |
|
269 | $ mktestrepo missing-prune | |
213 | $ mkcommit 'C-A0' |
|
270 | $ mkcommit 'C-A0' | |
214 | $ mkcommit 'C-B0' |
|
271 | $ mkcommit 'C-B0' | |
215 | $ hg up 'desc("ROOT")' |
|
272 | $ hg up 'desc("ROOT")' | |
216 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
273 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
217 | $ mkcommit 'C-A1' |
|
274 | $ mkcommit 'C-A1' | |
218 | created new head |
|
275 | created new head | |
219 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
276 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
220 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
277 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
221 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
278 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
222 |
|
279 | |||
223 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
280 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
224 |
|
281 | |||
225 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
|
282 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup | |
226 |
|
283 | |||
227 | $ hg up 'desc("ROOT")' |
|
284 | $ hg up 'desc("ROOT")' | |
228 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
285 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
229 | $ hg log --hidden -G |
|
286 | $ hg log --hidden -G | |
230 | o cf2c22470d67: C-A1 |
|
287 | o cf2c22470d67: C-A1 | |
231 | | |
|
288 | | | |
232 | @ ea207398892e: ROOT |
|
289 | @ ea207398892e: ROOT | |
233 |
|
290 | |||
234 | $ hg debugobsolete |
|
291 | $ hg debugobsolete | |
235 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
292 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
236 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
293 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
237 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
294 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
238 |
|
295 | |||
239 | Actual testing |
|
296 | Actual testing | |
240 | -------------- |
|
297 | -------------- | |
241 |
|
298 | |||
242 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
299 | $ hg debugobsolete --rev 'desc("C-A1")' | |
243 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
300 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
244 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
301 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
245 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
302 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
246 |
|
303 | |||
247 | chain with precursors also pruned |
|
304 | chain with precursors also pruned | |
248 | ================================= |
|
305 | ================================= | |
249 |
|
306 | |||
250 | . A0 (also pruned) |
|
307 | . A0 (also pruned) | |
251 | . ⇠◌⇠◔ A1 |
|
308 | . ⇠◌⇠◔ A1 | |
252 | . | |
|
309 | . | | |
253 | . ● |
|
310 | . ● | |
254 |
|
311 | |||
255 | setup |
|
312 | setup | |
256 | ----- |
|
313 | ----- | |
257 |
|
314 | |||
258 | $ mktestrepo prune-inline-missing |
|
315 | $ mktestrepo prune-inline-missing | |
259 | $ mkcommit 'C-A0' |
|
316 | $ mkcommit 'C-A0' | |
260 | $ hg up 'desc("ROOT")' |
|
317 | $ hg up 'desc("ROOT")' | |
261 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
318 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
262 | $ mkcommit 'C-A1' |
|
319 | $ mkcommit 'C-A1' | |
263 | created new head |
|
320 | created new head | |
264 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
321 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
265 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
322 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
266 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
323 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
267 |
|
324 | |||
268 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
325 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
269 |
|
326 | |||
270 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
|
327 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup | |
271 |
|
328 | |||
272 | $ hg up 'desc("ROOT")' |
|
329 | $ hg up 'desc("ROOT")' | |
273 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
330 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
274 | $ hg log --hidden -G |
|
331 | $ hg log --hidden -G | |
275 | o cf2c22470d67: C-A1 |
|
332 | o cf2c22470d67: C-A1 | |
276 | | |
|
333 | | | |
277 | @ ea207398892e: ROOT |
|
334 | @ ea207398892e: ROOT | |
278 |
|
335 | |||
279 | $ hg debugobsolete |
|
336 | $ hg debugobsolete | |
280 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
337 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
281 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
338 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
282 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
339 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
283 |
|
340 | |||
284 | Actual testing |
|
341 | Actual testing | |
285 | -------------- |
|
342 | -------------- | |
286 |
|
343 | |||
287 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
344 | $ hg debugobsolete --rev 'desc("C-A1")' | |
288 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
345 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
289 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
346 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
290 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
347 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
291 |
|
348 | |||
292 | Chain with fold and split |
|
349 | Chain with fold and split | |
293 | ========================= |
|
350 | ========================= | |
294 |
|
351 | |||
295 | setup |
|
352 | setup | |
296 | ----- |
|
353 | ----- | |
297 |
|
354 | |||
298 | $ mktestrepo split-fold |
|
355 | $ mktestrepo split-fold | |
299 | $ mkcommit 'C-A' |
|
356 | $ mkcommit 'C-A' | |
300 | $ hg up 'desc("ROOT")' |
|
357 | $ hg up 'desc("ROOT")' | |
301 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
358 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
302 | $ mkcommit 'C-B' |
|
359 | $ mkcommit 'C-B' | |
303 | created new head |
|
360 | created new head | |
304 | $ hg up 'desc("ROOT")' |
|
361 | $ hg up 'desc("ROOT")' | |
305 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
362 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
306 | $ mkcommit 'C-C' |
|
363 | $ mkcommit 'C-C' | |
307 | created new head |
|
364 | created new head | |
308 | $ hg up 'desc("ROOT")' |
|
365 | $ hg up 'desc("ROOT")' | |
309 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
366 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
310 | $ mkcommit 'C-D' |
|
367 | $ mkcommit 'C-D' | |
311 | created new head |
|
368 | created new head | |
312 | $ hg up 'desc("ROOT")' |
|
369 | $ hg up 'desc("ROOT")' | |
313 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
370 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
314 | $ mkcommit 'C-E' |
|
371 | $ mkcommit 'C-E' | |
315 | created new head |
|
372 | created new head | |
316 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` |
|
373 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` | |
317 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split |
|
374 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split | |
318 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
|
375 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent | |
319 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 |
|
376 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 | |
320 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` |
|
377 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` | |
321 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` |
|
378 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` | |
322 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` |
|
379 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` | |
323 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` |
|
380 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` | |
324 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` |
|
381 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` | |
325 |
|
382 | |||
326 | $ hg up 'desc("ROOT")' |
|
383 | $ hg up 'desc("ROOT")' | |
327 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
384 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
328 | $ hg log --hidden -G |
|
385 | $ hg log --hidden -G | |
329 | o 2f20ff6509f0: C-E |
|
386 | o 2f20ff6509f0: C-E | |
330 | | |
|
387 | | | |
331 | | x 06dc9da25ef0: C-D |
|
388 | | x 06dc9da25ef0: C-D | |
332 | |/ |
|
389 | |/ | |
333 | | x 27ec657ca21d: C-C |
|
390 | | x 27ec657ca21d: C-C | |
334 | |/ |
|
391 | |/ | |
335 | | x a9b9da38ed96: C-B |
|
392 | | x a9b9da38ed96: C-B | |
336 | |/ |
|
393 | |/ | |
337 | | x 9ac430e15fca: C-A |
|
394 | | x 9ac430e15fca: C-A | |
338 | |/ |
|
395 | |/ | |
339 | @ ea207398892e: ROOT |
|
396 | @ ea207398892e: ROOT | |
340 |
|
397 | |||
341 | $ hg debugobsolete |
|
398 | $ hg debugobsolete | |
342 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
399 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
343 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
400 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
344 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
401 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
345 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
402 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
346 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
403 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
347 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
404 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
348 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
405 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
349 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
406 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
350 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
407 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
351 |
|
408 | |||
352 | Actual testing |
|
409 | Actual testing | |
353 | -------------- |
|
410 | -------------- | |
354 |
|
411 | |||
355 | $ hg debugobsolete --rev 'desc("C-A")' |
|
412 | $ hg debugobsolete --rev 'desc("C-A")' | |
356 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
413 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
357 | $ hg debugobsolete --rev 'desc("C-B")' |
|
414 | $ hg debugobsolete --rev 'desc("C-B")' | |
358 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
415 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
359 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
416 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
360 | $ hg debugobsolete --rev 'desc("C-C")' |
|
417 | $ hg debugobsolete --rev 'desc("C-C")' | |
361 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
418 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
362 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
419 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
363 | $ hg debugobsolete --rev 'desc("C-D")' |
|
420 | $ hg debugobsolete --rev 'desc("C-D")' | |
364 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
421 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
365 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
422 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
366 | $ hg debugobsolete --rev 'desc("C-E")' |
|
423 | $ hg debugobsolete --rev 'desc("C-E")' | |
367 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
424 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
368 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
425 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
369 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
426 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
370 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
427 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
371 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
428 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
372 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
429 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
373 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
430 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
374 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
431 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
375 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
432 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
376 |
|
433 | |||
377 | changeset pruned on its own |
|
434 | changeset pruned on its own | |
378 | =========================== |
|
435 | =========================== | |
379 |
|
436 | |||
380 | . ⊗ B |
|
437 | . ⊗ B | |
381 | . | |
|
438 | . | | |
382 | . ◕ A |
|
439 | . ◕ A | |
383 | . | |
|
440 | . | | |
384 | . ● |
|
441 | . ● | |
385 |
|
442 | |||
386 | setup |
|
443 | setup | |
387 | ----- |
|
444 | ----- | |
388 |
|
445 | |||
389 | $ mktestrepo lonely-prune |
|
446 | $ mktestrepo lonely-prune | |
390 | $ hg up 'desc("ROOT")' |
|
447 | $ hg up 'desc("ROOT")' | |
391 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
448 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
392 | $ mkcommit 'C-A' |
|
449 | $ mkcommit 'C-A' | |
393 | $ mkcommit 'C-B' |
|
450 | $ mkcommit 'C-B' | |
394 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` |
|
451 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` | |
395 |
|
452 | |||
396 | $ hg up 'desc("ROOT")' |
|
453 | $ hg up 'desc("ROOT")' | |
397 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
454 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
398 | $ hg log --hidden -G |
|
455 | $ hg log --hidden -G | |
399 | x cefb651fc2fd: C-B |
|
456 | x cefb651fc2fd: C-B | |
400 | | |
|
457 | | | |
401 | o 9ac430e15fca: C-A |
|
458 | o 9ac430e15fca: C-A | |
402 | | |
|
459 | | | |
403 | @ ea207398892e: ROOT |
|
460 | @ ea207398892e: ROOT | |
404 |
|
461 | |||
405 | $ hg debugobsolete |
|
462 | $ hg debugobsolete | |
406 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
463 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
407 |
|
464 | |||
408 | Actual testing |
|
465 | Actual testing | |
409 | -------------- |
|
466 | -------------- | |
410 | $ hg debugobsolete --rev 'desc("C-A")' |
|
467 | $ hg debugobsolete --rev 'desc("C-A")' | |
411 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
468 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
412 | $ hg debugobsolete --hidden --rev 'desc("C-B")' |
|
469 | $ hg debugobsolete --hidden --rev 'desc("C-B")' | |
413 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
470 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
General Comments 0
You need to be logged in to leave comments.
Login now