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