##// END OF EJS Templates
test-obsolete: sort the output of debugobsolete...
Pierre-Yves David -
r22349:9d1f3896 default
parent child Browse files
Show More
@@ -1,748 +1,748 b''
1 $ cat >> $HGRCPATH << EOF
1 $ cat >> $HGRCPATH << EOF
2 > [phases]
2 > [phases]
3 > # public changeset are not obsolete
3 > # public changeset are not obsolete
4 > publish=false
4 > publish=false
5 > [ui]
5 > [ui]
6 > logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n"
6 > logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n"
7 > EOF
7 > EOF
8 $ mkcommit() {
8 $ mkcommit() {
9 > echo "$1" > "$1"
9 > echo "$1" > "$1"
10 > hg add "$1"
10 > hg add "$1"
11 > hg ci -m "add $1"
11 > hg ci -m "add $1"
12 > }
12 > }
13 $ getid() {
13 $ getid() {
14 > hg id --debug --hidden -ir "desc('$1')"
14 > hg id --debug --hidden -ir "desc('$1')"
15 > }
15 > }
16
16
17 $ cat > debugkeys.py <<EOF
17 $ cat > debugkeys.py <<EOF
18 > def reposetup(ui, repo):
18 > def reposetup(ui, repo):
19 > class debugkeysrepo(repo.__class__):
19 > class debugkeysrepo(repo.__class__):
20 > def listkeys(self, namespace):
20 > def listkeys(self, namespace):
21 > ui.write('listkeys %s\n' % (namespace,))
21 > ui.write('listkeys %s\n' % (namespace,))
22 > return super(debugkeysrepo, self).listkeys(namespace)
22 > return super(debugkeysrepo, self).listkeys(namespace)
23 >
23 >
24 > if repo.local():
24 > if repo.local():
25 > repo.__class__ = debugkeysrepo
25 > repo.__class__ = debugkeysrepo
26 > EOF
26 > EOF
27
27
28 $ hg init tmpa
28 $ hg init tmpa
29 $ cd tmpa
29 $ cd tmpa
30 $ mkcommit kill_me
30 $ mkcommit kill_me
31
31
32 Checking that the feature is properly disabled
32 Checking that the feature is properly disabled
33
33
34 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
34 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
35 abort: obsolete feature is not enabled on this repo
35 abort: obsolete feature is not enabled on this repo
36 [255]
36 [255]
37
37
38 Enabling it
38 Enabling it
39
39
40 $ cat > ../obs.py << EOF
40 $ cat > ../obs.py << EOF
41 > import mercurial.obsolete
41 > import mercurial.obsolete
42 > mercurial.obsolete._enabled = True
42 > mercurial.obsolete._enabled = True
43 > EOF
43 > EOF
44 $ echo '[extensions]' >> $HGRCPATH
44 $ echo '[extensions]' >> $HGRCPATH
45 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
45 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
46
46
47 Killing a single changeset without replacement
47 Killing a single changeset without replacement
48
48
49 $ hg debugobsolete 0
49 $ hg debugobsolete 0
50 abort: changeset references must be full hexadecimal node identifiers
50 abort: changeset references must be full hexadecimal node identifiers
51 [255]
51 [255]
52 $ hg debugobsolete '00'
52 $ hg debugobsolete '00'
53 abort: changeset references must be full hexadecimal node identifiers
53 abort: changeset references must be full hexadecimal node identifiers
54 [255]
54 [255]
55 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
55 $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
56 $ hg debugobsolete
56 $ hg debugobsolete
57 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}
57 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}
58
58
59 (test that mercurial is not confused)
59 (test that mercurial is not confused)
60
60
61 $ hg up null --quiet # having 0 as parent prevents it to be hidden
61 $ hg up null --quiet # having 0 as parent prevents it to be hidden
62 $ hg tip
62 $ hg tip
63 -1:000000000000 (public) [tip ]
63 -1:000000000000 (public) [tip ]
64 $ hg up --hidden tip --quiet
64 $ hg up --hidden tip --quiet
65
65
66 Killing a single changeset with itself should fail
66 Killing a single changeset with itself should fail
67 (simple local safeguard)
67 (simple local safeguard)
68
68
69 $ hg debugobsolete `getid kill_me` `getid kill_me`
69 $ hg debugobsolete `getid kill_me` `getid kill_me`
70 abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0
70 abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0
71 [255]
71 [255]
72
72
73 $ cd ..
73 $ cd ..
74
74
75 Killing a single changeset with replacement
75 Killing a single changeset with replacement
76
76
77 $ hg init tmpb
77 $ hg init tmpb
78 $ cd tmpb
78 $ cd tmpb
79 $ mkcommit a
79 $ mkcommit a
80 $ mkcommit b
80 $ mkcommit b
81 $ mkcommit original_c
81 $ mkcommit original_c
82 $ hg up "desc('b')"
82 $ hg up "desc('b')"
83 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
83 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
84 $ mkcommit new_c
84 $ mkcommit new_c
85 created new head
85 created new head
86 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
86 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
87 $ hg debugobsolete --flag 12 `getid original_c` `getid new_c` -d '56 12'
87 $ hg debugobsolete --flag 12 `getid original_c` `getid new_c` -d '56 12'
88 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
88 $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
89 2:245bde4270cd add original_c
89 2:245bde4270cd add original_c
90 $ hg debugrevlog -cd
90 $ hg debugrevlog -cd
91 # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen
91 # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen
92 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0
92 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0
93 1 0 -1 59 118 59 59 0 0 58 116 0 1 0
93 1 0 -1 59 118 59 59 0 0 58 116 0 1 0
94 2 1 -1 118 204 59 59 59 0 76 192 0 1 1
94 2 1 -1 118 204 59 59 59 0 76 192 0 1 1
95 3 1 -1 204 271 204 204 59 0 66 258 0 2 0
95 3 1 -1 204 271 204 204 59 0 66 258 0 2 0
96 $ hg debugobsolete
96 $ hg debugobsolete
97 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
97 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
98
98
99 do it again (it read the obsstore before adding new changeset)
99 do it again (it read the obsstore before adding new changeset)
100
100
101 $ hg up '.^'
101 $ hg up '.^'
102 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
102 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
103 $ mkcommit new_2_c
103 $ mkcommit new_2_c
104 created new head
104 created new head
105 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
105 $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
106 $ hg debugobsolete
106 $ hg debugobsolete
107 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
107 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
108 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
108 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
109
109
110 Register two markers with a missing node
110 Register two markers with a missing node
111
111
112 $ hg up '.^'
112 $ hg up '.^'
113 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
113 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
114 $ mkcommit new_3_c
114 $ mkcommit new_3_c
115 created new head
115 created new head
116 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
116 $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
117 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
117 $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
118 $ hg debugobsolete
118 $ hg debugobsolete
119 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
119 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
120 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
120 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
121 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
121 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
122 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
122 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
123
123
124 Refuse pathological nullid successors
124 Refuse pathological nullid successors
125 $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000
125 $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000
126 transaction abort!
126 transaction abort!
127 rollback completed
127 rollback completed
128 abort: bad obsolescence marker detected: invalid successors nullid
128 abort: bad obsolescence marker detected: invalid successors nullid
129 [255]
129 [255]
130
130
131 Check that graphlog detect that a changeset is obsolete:
131 Check that graphlog detect that a changeset is obsolete:
132
132
133 $ hg log -G
133 $ hg log -G
134 @ 5:5601fb93a350 (draft) [tip ] add new_3_c
134 @ 5:5601fb93a350 (draft) [tip ] add new_3_c
135 |
135 |
136 o 1:7c3bad9141dc (draft) [ ] add b
136 o 1:7c3bad9141dc (draft) [ ] add b
137 |
137 |
138 o 0:1f0dee641bb7 (draft) [ ] add a
138 o 0:1f0dee641bb7 (draft) [ ] add a
139
139
140
140
141 check that heads does not report them
141 check that heads does not report them
142
142
143 $ hg heads
143 $ hg heads
144 5:5601fb93a350 (draft) [tip ] add new_3_c
144 5:5601fb93a350 (draft) [tip ] add new_3_c
145 $ hg heads --hidden
145 $ hg heads --hidden
146 5:5601fb93a350 (draft) [tip ] add new_3_c
146 5:5601fb93a350 (draft) [tip ] add new_3_c
147 4:ca819180edb9 (draft) [ ] add new_2_c
147 4:ca819180edb9 (draft) [ ] add new_2_c
148 3:cdbce2fbb163 (draft) [ ] add new_c
148 3:cdbce2fbb163 (draft) [ ] add new_c
149 2:245bde4270cd (draft) [ ] add original_c
149 2:245bde4270cd (draft) [ ] add original_c
150
150
151
151
152 check that summary does not report them
152 check that summary does not report them
153
153
154 $ hg init ../sink
154 $ hg init ../sink
155 $ echo '[paths]' >> .hg/hgrc
155 $ echo '[paths]' >> .hg/hgrc
156 $ echo 'default=../sink' >> .hg/hgrc
156 $ echo 'default=../sink' >> .hg/hgrc
157 $ hg summary --remote
157 $ hg summary --remote
158 parent: 5:5601fb93a350 tip
158 parent: 5:5601fb93a350 tip
159 add new_3_c
159 add new_3_c
160 branch: default
160 branch: default
161 commit: (clean)
161 commit: (clean)
162 update: (current)
162 update: (current)
163 remote: 3 outgoing
163 remote: 3 outgoing
164
164
165 $ hg summary --remote --hidden
165 $ hg summary --remote --hidden
166 parent: 5:5601fb93a350 tip
166 parent: 5:5601fb93a350 tip
167 add new_3_c
167 add new_3_c
168 branch: default
168 branch: default
169 commit: (clean)
169 commit: (clean)
170 update: 3 new changesets, 4 branch heads (merge)
170 update: 3 new changesets, 4 branch heads (merge)
171 remote: 3 outgoing
171 remote: 3 outgoing
172
172
173 check that various commands work well with filtering
173 check that various commands work well with filtering
174
174
175 $ hg tip
175 $ hg tip
176 5:5601fb93a350 (draft) [tip ] add new_3_c
176 5:5601fb93a350 (draft) [tip ] add new_3_c
177 $ hg log -r 6
177 $ hg log -r 6
178 abort: unknown revision '6'!
178 abort: unknown revision '6'!
179 [255]
179 [255]
180 $ hg log -r 4
180 $ hg log -r 4
181 abort: unknown revision '4'!
181 abort: unknown revision '4'!
182 [255]
182 [255]
183
183
184 Check that public changeset are not accounted as obsolete:
184 Check that public changeset are not accounted as obsolete:
185
185
186 $ hg --hidden phase --public 2
186 $ hg --hidden phase --public 2
187 $ hg log -G
187 $ hg log -G
188 @ 5:5601fb93a350 (draft) [tip ] add new_3_c
188 @ 5:5601fb93a350 (draft) [tip ] add new_3_c
189 |
189 |
190 | o 2:245bde4270cd (public) [ ] add original_c
190 | o 2:245bde4270cd (public) [ ] add original_c
191 |/
191 |/
192 o 1:7c3bad9141dc (public) [ ] add b
192 o 1:7c3bad9141dc (public) [ ] add b
193 |
193 |
194 o 0:1f0dee641bb7 (public) [ ] add a
194 o 0:1f0dee641bb7 (public) [ ] add a
195
195
196
196
197 And that bumped changeset are detected
197 And that bumped changeset are detected
198 --------------------------------------
198 --------------------------------------
199
199
200 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also
200 If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also
201 note that the bumped changeset (5:5601fb93a350) is not a direct successor of
201 note that the bumped changeset (5:5601fb93a350) is not a direct successor of
202 the public changeset
202 the public changeset
203
203
204 $ hg log --hidden -r 'bumped()'
204 $ hg log --hidden -r 'bumped()'
205 5:5601fb93a350 (draft) [tip ] add new_3_c
205 5:5601fb93a350 (draft) [tip ] add new_3_c
206
206
207 And that we can't push bumped changeset
207 And that we can't push bumped changeset
208
208
209 $ hg push ../tmpa -r 0 --force #(make repo related)
209 $ hg push ../tmpa -r 0 --force #(make repo related)
210 pushing to ../tmpa
210 pushing to ../tmpa
211 searching for changes
211 searching for changes
212 warning: repository is unrelated
212 warning: repository is unrelated
213 adding changesets
213 adding changesets
214 adding manifests
214 adding manifests
215 adding file changes
215 adding file changes
216 added 1 changesets with 1 changes to 1 files (+1 heads)
216 added 1 changesets with 1 changes to 1 files (+1 heads)
217 $ hg push ../tmpa
217 $ hg push ../tmpa
218 pushing to ../tmpa
218 pushing to ../tmpa
219 searching for changes
219 searching for changes
220 abort: push includes bumped changeset: 5601fb93a350!
220 abort: push includes bumped changeset: 5601fb93a350!
221 [255]
221 [255]
222
222
223 Fixing "bumped" situation
223 Fixing "bumped" situation
224 We need to create a clone of 5 and add a special marker with a flag
224 We need to create a clone of 5 and add a special marker with a flag
225
225
226 $ hg up '5^'
226 $ hg up '5^'
227 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
227 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
228 $ hg revert -ar 5
228 $ hg revert -ar 5
229 adding new_3_c
229 adding new_3_c
230 $ hg ci -m 'add n3w_3_c'
230 $ hg ci -m 'add n3w_3_c'
231 created new head
231 created new head
232 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
232 $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
233 $ hg log -r 'bumped()'
233 $ hg log -r 'bumped()'
234 $ hg log -G
234 $ hg log -G
235 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
235 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
236 |
236 |
237 | o 2:245bde4270cd (public) [ ] add original_c
237 | o 2:245bde4270cd (public) [ ] add original_c
238 |/
238 |/
239 o 1:7c3bad9141dc (public) [ ] add b
239 o 1:7c3bad9141dc (public) [ ] add b
240 |
240 |
241 o 0:1f0dee641bb7 (public) [ ] add a
241 o 0:1f0dee641bb7 (public) [ ] add a
242
242
243
243
244
244
245
245
246 $ cd ..
246 $ cd ..
247
247
248 Exchange Test
248 Exchange Test
249 ============================
249 ============================
250
250
251 Destination repo does not have any data
251 Destination repo does not have any data
252 ---------------------------------------
252 ---------------------------------------
253
253
254 Simple incoming test
254 Simple incoming test
255
255
256 $ hg init tmpc
256 $ hg init tmpc
257 $ cd tmpc
257 $ cd tmpc
258 $ hg incoming ../tmpb
258 $ hg incoming ../tmpb
259 comparing with ../tmpb
259 comparing with ../tmpb
260 0:1f0dee641bb7 (public) [ ] add a
260 0:1f0dee641bb7 (public) [ ] add a
261 1:7c3bad9141dc (public) [ ] add b
261 1:7c3bad9141dc (public) [ ] add b
262 2:245bde4270cd (public) [ ] add original_c
262 2:245bde4270cd (public) [ ] add original_c
263 6:6f9641995072 (draft) [tip ] add n3w_3_c
263 6:6f9641995072 (draft) [tip ] add n3w_3_c
264
264
265 Try to pull markers
265 Try to pull markers
266 (extinct changeset are excluded but marker are pushed)
266 (extinct changeset are excluded but marker are pushed)
267
267
268 $ hg pull ../tmpb
268 $ hg pull ../tmpb
269 pulling from ../tmpb
269 pulling from ../tmpb
270 requesting all changes
270 requesting all changes
271 adding changesets
271 adding changesets
272 adding manifests
272 adding manifests
273 adding file changes
273 adding file changes
274 added 4 changesets with 4 changes to 4 files (+1 heads)
274 added 4 changesets with 4 changes to 4 files (+1 heads)
275 (run 'hg heads' to see heads, 'hg merge' to merge)
275 (run 'hg heads' to see heads, 'hg merge' to merge)
276 $ hg debugobsolete
276 $ hg debugobsolete
277 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
277 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
278 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
278 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
279 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
279 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
280 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
280 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
281 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
281 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
282
282
283 Rollback//Transaction support
283 Rollback//Transaction support
284
284
285 $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
285 $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
286 $ hg debugobsolete
286 $ hg debugobsolete
287 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
287 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
288 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
288 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
289 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
289 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
290 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
290 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
291 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
291 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
292 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'}
292 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'}
293 $ hg rollback -n
293 $ hg rollback -n
294 repository tip rolled back to revision 3 (undo debugobsolete)
294 repository tip rolled back to revision 3 (undo debugobsolete)
295 $ hg rollback
295 $ hg rollback
296 repository tip rolled back to revision 3 (undo debugobsolete)
296 repository tip rolled back to revision 3 (undo debugobsolete)
297 $ hg debugobsolete
297 $ hg debugobsolete
298 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
298 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
299 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
299 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
300 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
300 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
301 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
301 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
302 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
302 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
303
303
304 $ cd ..
304 $ cd ..
305
305
306 Try to push markers
306 Try to push markers
307
307
308 $ hg init tmpd
308 $ hg init tmpd
309 $ hg -R tmpb push tmpd
309 $ hg -R tmpb push tmpd
310 pushing to tmpd
310 pushing to tmpd
311 searching for changes
311 searching for changes
312 adding changesets
312 adding changesets
313 adding manifests
313 adding manifests
314 adding file changes
314 adding file changes
315 added 4 changesets with 4 changes to 4 files (+1 heads)
315 added 4 changesets with 4 changes to 4 files (+1 heads)
316 $ hg -R tmpd debugobsolete
316 $ hg -R tmpd debugobsolete | sort
317 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
317 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
318 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
319 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
320 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
318 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
321 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
319 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
320 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
321 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
322
322
323 Check obsolete keys are exchanged only if source has an obsolete store
323 Check obsolete keys are exchanged only if source has an obsolete store
324
324
325 $ hg init empty
325 $ hg init empty
326 $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd
326 $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd
327 pushing to tmpd
327 pushing to tmpd
328 listkeys phases
328 listkeys phases
329 listkeys bookmarks
329 listkeys bookmarks
330 no changes found
330 no changes found
331 listkeys phases
331 listkeys phases
332 [1]
332 [1]
333
333
334 clone support
334 clone support
335 (markers are copied and extinct changesets are included to allow hardlinks)
335 (markers are copied and extinct changesets are included to allow hardlinks)
336
336
337 $ hg clone tmpb clone-dest
337 $ hg clone tmpb clone-dest
338 updating to branch default
338 updating to branch default
339 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
339 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
340 $ hg -R clone-dest log -G --hidden
340 $ hg -R clone-dest log -G --hidden
341 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
341 @ 6:6f9641995072 (draft) [tip ] add n3w_3_c
342 |
342 |
343 | x 5:5601fb93a350 (draft) [ ] add new_3_c
343 | x 5:5601fb93a350 (draft) [ ] add new_3_c
344 |/
344 |/
345 | x 4:ca819180edb9 (draft) [ ] add new_2_c
345 | x 4:ca819180edb9 (draft) [ ] add new_2_c
346 |/
346 |/
347 | x 3:cdbce2fbb163 (draft) [ ] add new_c
347 | x 3:cdbce2fbb163 (draft) [ ] add new_c
348 |/
348 |/
349 | o 2:245bde4270cd (public) [ ] add original_c
349 | o 2:245bde4270cd (public) [ ] add original_c
350 |/
350 |/
351 o 1:7c3bad9141dc (public) [ ] add b
351 o 1:7c3bad9141dc (public) [ ] add b
352 |
352 |
353 o 0:1f0dee641bb7 (public) [ ] add a
353 o 0:1f0dee641bb7 (public) [ ] add a
354
354
355 $ hg -R clone-dest debugobsolete
355 $ hg -R clone-dest debugobsolete
356 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
356 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
357 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
357 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
358 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
358 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
359 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
359 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
360 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
360 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
361
361
362
362
363 Destination repo have existing data
363 Destination repo have existing data
364 ---------------------------------------
364 ---------------------------------------
365
365
366 On pull
366 On pull
367
367
368 $ hg init tmpe
368 $ hg init tmpe
369 $ cd tmpe
369 $ cd tmpe
370 $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00
370 $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00
371 $ hg pull ../tmpb
371 $ hg pull ../tmpb
372 pulling from ../tmpb
372 pulling from ../tmpb
373 requesting all changes
373 requesting all changes
374 adding changesets
374 adding changesets
375 adding manifests
375 adding manifests
376 adding file changes
376 adding file changes
377 added 4 changesets with 4 changes to 4 files (+1 heads)
377 added 4 changesets with 4 changes to 4 files (+1 heads)
378 (run 'hg heads' to see heads, 'hg merge' to merge)
378 (run 'hg heads' to see heads, 'hg merge' to merge)
379 $ hg debugobsolete
379 $ hg debugobsolete
380 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
380 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
381 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
381 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
382 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
382 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
383 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
383 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
384 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
384 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
385 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
385 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
386
386
387
387
388 On push
388 On push
389
389
390 $ hg push ../tmpc
390 $ hg push ../tmpc
391 pushing to ../tmpc
391 pushing to ../tmpc
392 searching for changes
392 searching for changes
393 no changes found
393 no changes found
394 [1]
394 [1]
395 $ hg -R ../tmpc debugobsolete
395 $ hg -R ../tmpc debugobsolete
396 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
396 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
397 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
397 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
398 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
398 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
399 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
399 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
400 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
400 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
401 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
401 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
402
402
403 detect outgoing obsolete and unstable
403 detect outgoing obsolete and unstable
404 ---------------------------------------
404 ---------------------------------------
405
405
406
406
407 $ hg log -G
407 $ hg log -G
408 o 3:6f9641995072 (draft) [tip ] add n3w_3_c
408 o 3:6f9641995072 (draft) [tip ] add n3w_3_c
409 |
409 |
410 | o 2:245bde4270cd (public) [ ] add original_c
410 | o 2:245bde4270cd (public) [ ] add original_c
411 |/
411 |/
412 o 1:7c3bad9141dc (public) [ ] add b
412 o 1:7c3bad9141dc (public) [ ] add b
413 |
413 |
414 o 0:1f0dee641bb7 (public) [ ] add a
414 o 0:1f0dee641bb7 (public) [ ] add a
415
415
416 $ hg up 'desc("n3w_3_c")'
416 $ hg up 'desc("n3w_3_c")'
417 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
417 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
418 $ mkcommit original_d
418 $ mkcommit original_d
419 $ mkcommit original_e
419 $ mkcommit original_e
420 $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
420 $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
421 $ hg debugobsolete | grep `getid original_d`
421 $ hg debugobsolete | grep `getid original_d`
422 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
422 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
423 $ hg log -r 'obsolete()'
423 $ hg log -r 'obsolete()'
424 4:94b33453f93b (draft) [ ] add original_d
424 4:94b33453f93b (draft) [ ] add original_d
425 $ hg log -G -r '::unstable()'
425 $ hg log -G -r '::unstable()'
426 @ 5:cda648ca50f5 (draft) [tip ] add original_e
426 @ 5:cda648ca50f5 (draft) [tip ] add original_e
427 |
427 |
428 x 4:94b33453f93b (draft) [ ] add original_d
428 x 4:94b33453f93b (draft) [ ] add original_d
429 |
429 |
430 o 3:6f9641995072 (draft) [ ] add n3w_3_c
430 o 3:6f9641995072 (draft) [ ] add n3w_3_c
431 |
431 |
432 o 1:7c3bad9141dc (public) [ ] add b
432 o 1:7c3bad9141dc (public) [ ] add b
433 |
433 |
434 o 0:1f0dee641bb7 (public) [ ] add a
434 o 0:1f0dee641bb7 (public) [ ] add a
435
435
436
436
437 refuse to push obsolete changeset
437 refuse to push obsolete changeset
438
438
439 $ hg push ../tmpc/ -r 'desc("original_d")'
439 $ hg push ../tmpc/ -r 'desc("original_d")'
440 pushing to ../tmpc/
440 pushing to ../tmpc/
441 searching for changes
441 searching for changes
442 abort: push includes obsolete changeset: 94b33453f93b!
442 abort: push includes obsolete changeset: 94b33453f93b!
443 [255]
443 [255]
444
444
445 refuse to push unstable changeset
445 refuse to push unstable changeset
446
446
447 $ hg push ../tmpc/
447 $ hg push ../tmpc/
448 pushing to ../tmpc/
448 pushing to ../tmpc/
449 searching for changes
449 searching for changes
450 abort: push includes unstable changeset: cda648ca50f5!
450 abort: push includes unstable changeset: cda648ca50f5!
451 [255]
451 [255]
452
452
453 Test that extinct changeset are properly detected
453 Test that extinct changeset are properly detected
454
454
455 $ hg log -r 'extinct()'
455 $ hg log -r 'extinct()'
456
456
457 Don't try to push extinct changeset
457 Don't try to push extinct changeset
458
458
459 $ hg init ../tmpf
459 $ hg init ../tmpf
460 $ hg out ../tmpf
460 $ hg out ../tmpf
461 comparing with ../tmpf
461 comparing with ../tmpf
462 searching for changes
462 searching for changes
463 0:1f0dee641bb7 (public) [ ] add a
463 0:1f0dee641bb7 (public) [ ] add a
464 1:7c3bad9141dc (public) [ ] add b
464 1:7c3bad9141dc (public) [ ] add b
465 2:245bde4270cd (public) [ ] add original_c
465 2:245bde4270cd (public) [ ] add original_c
466 3:6f9641995072 (draft) [ ] add n3w_3_c
466 3:6f9641995072 (draft) [ ] add n3w_3_c
467 4:94b33453f93b (draft) [ ] add original_d
467 4:94b33453f93b (draft) [ ] add original_d
468 5:cda648ca50f5 (draft) [tip ] add original_e
468 5:cda648ca50f5 (draft) [tip ] add original_e
469 $ hg push ../tmpf -f # -f because be push unstable too
469 $ hg push ../tmpf -f # -f because be push unstable too
470 pushing to ../tmpf
470 pushing to ../tmpf
471 searching for changes
471 searching for changes
472 adding changesets
472 adding changesets
473 adding manifests
473 adding manifests
474 adding file changes
474 adding file changes
475 added 6 changesets with 6 changes to 6 files (+1 heads)
475 added 6 changesets with 6 changes to 6 files (+1 heads)
476
476
477 no warning displayed
477 no warning displayed
478
478
479 $ hg push ../tmpf
479 $ hg push ../tmpf
480 pushing to ../tmpf
480 pushing to ../tmpf
481 searching for changes
481 searching for changes
482 no changes found
482 no changes found
483 [1]
483 [1]
484
484
485 Do not warn about new head when the new head is a successors of a remote one
485 Do not warn about new head when the new head is a successors of a remote one
486
486
487 $ hg log -G
487 $ hg log -G
488 @ 5:cda648ca50f5 (draft) [tip ] add original_e
488 @ 5:cda648ca50f5 (draft) [tip ] add original_e
489 |
489 |
490 x 4:94b33453f93b (draft) [ ] add original_d
490 x 4:94b33453f93b (draft) [ ] add original_d
491 |
491 |
492 o 3:6f9641995072 (draft) [ ] add n3w_3_c
492 o 3:6f9641995072 (draft) [ ] add n3w_3_c
493 |
493 |
494 | o 2:245bde4270cd (public) [ ] add original_c
494 | o 2:245bde4270cd (public) [ ] add original_c
495 |/
495 |/
496 o 1:7c3bad9141dc (public) [ ] add b
496 o 1:7c3bad9141dc (public) [ ] add b
497 |
497 |
498 o 0:1f0dee641bb7 (public) [ ] add a
498 o 0:1f0dee641bb7 (public) [ ] add a
499
499
500 $ hg up -q 'desc(n3w_3_c)'
500 $ hg up -q 'desc(n3w_3_c)'
501 $ mkcommit obsolete_e
501 $ mkcommit obsolete_e
502 created new head
502 created new head
503 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'`
503 $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'`
504 $ hg outgoing ../tmpf # parasite hg outgoing testin
504 $ hg outgoing ../tmpf # parasite hg outgoing testin
505 comparing with ../tmpf
505 comparing with ../tmpf
506 searching for changes
506 searching for changes
507 6:3de5eca88c00 (draft) [tip ] add obsolete_e
507 6:3de5eca88c00 (draft) [tip ] add obsolete_e
508 $ hg push ../tmpf
508 $ hg push ../tmpf
509 pushing to ../tmpf
509 pushing to ../tmpf
510 searching for changes
510 searching for changes
511 adding changesets
511 adding changesets
512 adding manifests
512 adding manifests
513 adding file changes
513 adding file changes
514 added 1 changesets with 1 changes to 1 files (+1 heads)
514 added 1 changesets with 1 changes to 1 files (+1 heads)
515
515
516 test relevance computation
516 test relevance computation
517 ---------------------------------------
517 ---------------------------------------
518
518
519 Checking simple case of "marker relevance".
519 Checking simple case of "marker relevance".
520
520
521
521
522 Reminder of the repo situation
522 Reminder of the repo situation
523
523
524 $ hg log --hidden --graph
524 $ hg log --hidden --graph
525 @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e
525 @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e
526 |
526 |
527 | x 5:cda648ca50f5 (draft) [ ] add original_e
527 | x 5:cda648ca50f5 (draft) [ ] add original_e
528 | |
528 | |
529 | x 4:94b33453f93b (draft) [ ] add original_d
529 | x 4:94b33453f93b (draft) [ ] add original_d
530 |/
530 |/
531 o 3:6f9641995072 (draft) [ ] add n3w_3_c
531 o 3:6f9641995072 (draft) [ ] add n3w_3_c
532 |
532 |
533 | o 2:245bde4270cd (public) [ ] add original_c
533 | o 2:245bde4270cd (public) [ ] add original_c
534 |/
534 |/
535 o 1:7c3bad9141dc (public) [ ] add b
535 o 1:7c3bad9141dc (public) [ ] add b
536 |
536 |
537 o 0:1f0dee641bb7 (public) [ ] add a
537 o 0:1f0dee641bb7 (public) [ ] add a
538
538
539
539
540 List of all markers
540 List of all markers
541
541
542 $ hg debugobsolete
542 $ hg debugobsolete
543 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
543 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
544 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
544 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
545 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
545 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
546 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
546 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
547 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
547 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
548 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
548 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
549 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
549 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
550 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob)
550 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob)
551
551
552 List of changesets with no chain
552 List of changesets with no chain
553
553
554 $ hg debugobsolete --hidden --rev ::2
554 $ hg debugobsolete --hidden --rev ::2
555
555
556 List of changesets that are included on marker chain
556 List of changesets that are included on marker chain
557
557
558 $ hg debugobsolete --hidden --rev 6
558 $ hg debugobsolete --hidden --rev 6
559 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob)
559 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob)
560
560
561 List of changesets with a longer chain, (including a pruned children)
561 List of changesets with a longer chain, (including a pruned children)
562
562
563 $ hg debugobsolete --hidden --rev 3
563 $ hg debugobsolete --hidden --rev 3
564 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
564 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
565 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
565 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
566 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
566 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
567 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
567 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
568 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
568 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
569 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
569 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
570 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
570 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
571
571
572 List of both
572 List of both
573
573
574 $ hg debugobsolete --hidden --rev 3::6
574 $ hg debugobsolete --hidden --rev 3::6
575 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
575 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
576 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
576 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
577 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
577 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:44 1970 -0000) {'user': 'test'}
578 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
578 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
579 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
579 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
580 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
580 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
581 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob)
581 cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob)
582 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
582 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
583
583
584 #if serve
584 #if serve
585
585
586 check hgweb does not explode
586 check hgweb does not explode
587 ====================================
587 ====================================
588
588
589 $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg
589 $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg
590 adding changesets
590 adding changesets
591 adding manifests
591 adding manifests
592 adding file changes
592 adding file changes
593 added 62 changesets with 63 changes to 9 files (+60 heads)
593 added 62 changesets with 63 changes to 9 files (+60 heads)
594 (run 'hg heads .' to see heads, 'hg merge' to merge)
594 (run 'hg heads .' to see heads, 'hg merge' to merge)
595 $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;
595 $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;
596 > do
596 > do
597 > hg debugobsolete $node
597 > hg debugobsolete $node
598 > done
598 > done
599 $ hg up tip
599 $ hg up tip
600 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
600 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
601
601
602 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
602 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
603 $ cat hg.pid >> $DAEMON_PIDS
603 $ cat hg.pid >> $DAEMON_PIDS
604
604
605 check changelog view
605 check changelog view
606
606
607 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'shortlog/'
607 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'shortlog/'
608 200 Script output follows
608 200 Script output follows
609
609
610 check graph view
610 check graph view
611
611
612 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'graph'
612 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'graph'
613 200 Script output follows
613 200 Script output follows
614
614
615 check filelog view
615 check filelog view
616
616
617 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'log/'`hg id --debug --id`/'babar'
617 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'log/'`hg id --debug --id`/'babar'
618 200 Script output follows
618 200 Script output follows
619
619
620 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/68'
620 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/68'
621 200 Script output follows
621 200 Script output follows
622 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/67'
622 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/67'
623 404 Not Found
623 404 Not Found
624 [1]
624 [1]
625
625
626 check that web.view config option:
626 check that web.view config option:
627
627
628 $ "$TESTDIR/killdaemons.py" hg.pid
628 $ "$TESTDIR/killdaemons.py" hg.pid
629 $ cat >> .hg/hgrc << EOF
629 $ cat >> .hg/hgrc << EOF
630 > [web]
630 > [web]
631 > view=all
631 > view=all
632 > EOF
632 > EOF
633 $ wait
633 $ wait
634 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
634 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
635 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/67'
635 $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'rev/67'
636 200 Script output follows
636 200 Script output follows
637 $ "$TESTDIR/killdaemons.py" hg.pid
637 $ "$TESTDIR/killdaemons.py" hg.pid
638
638
639 Checking _enable=False warning if obsolete marker exists
639 Checking _enable=False warning if obsolete marker exists
640
640
641 $ echo '[extensions]' >> $HGRCPATH
641 $ echo '[extensions]' >> $HGRCPATH
642 $ echo "obs=!" >> $HGRCPATH
642 $ echo "obs=!" >> $HGRCPATH
643 $ hg log -r tip
643 $ hg log -r tip
644 obsolete feature not enabled but 68 markers found!
644 obsolete feature not enabled but 68 markers found!
645 68:c15e9edfca13 (draft) [tip ] add celestine
645 68:c15e9edfca13 (draft) [tip ] add celestine
646
646
647 reenable for later test
647 reenable for later test
648
648
649 $ echo '[extensions]' >> $HGRCPATH
649 $ echo '[extensions]' >> $HGRCPATH
650 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
650 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
651
651
652 #endif
652 #endif
653
653
654 Test incoming/outcoming with changesets obsoleted remotely, known locally
654 Test incoming/outcoming with changesets obsoleted remotely, known locally
655 ===============================================================================
655 ===============================================================================
656
656
657 This test issue 3805
657 This test issue 3805
658
658
659 $ hg init repo-issue3805
659 $ hg init repo-issue3805
660 $ cd repo-issue3805
660 $ cd repo-issue3805
661 $ echo "foo" > foo
661 $ echo "foo" > foo
662 $ hg ci -Am "A"
662 $ hg ci -Am "A"
663 adding foo
663 adding foo
664 $ hg clone . ../other-issue3805
664 $ hg clone . ../other-issue3805
665 updating to branch default
665 updating to branch default
666 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
666 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
667 $ echo "bar" >> foo
667 $ echo "bar" >> foo
668 $ hg ci --amend
668 $ hg ci --amend
669 $ cd ../other-issue3805
669 $ cd ../other-issue3805
670 $ hg log -G
670 $ hg log -G
671 @ 0:193e9254ce7e (draft) [tip ] A
671 @ 0:193e9254ce7e (draft) [tip ] A
672
672
673 $ hg log -G -R ../repo-issue3805
673 $ hg log -G -R ../repo-issue3805
674 @ 2:3816541e5485 (draft) [tip ] A
674 @ 2:3816541e5485 (draft) [tip ] A
675
675
676 $ hg incoming
676 $ hg incoming
677 comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
677 comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
678 searching for changes
678 searching for changes
679 2:3816541e5485 (draft) [tip ] A
679 2:3816541e5485 (draft) [tip ] A
680 $ hg incoming --bundle ../issue3805.hg
680 $ hg incoming --bundle ../issue3805.hg
681 comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
681 comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
682 searching for changes
682 searching for changes
683 2:3816541e5485 (draft) [tip ] A
683 2:3816541e5485 (draft) [tip ] A
684 $ hg outgoing
684 $ hg outgoing
685 comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
685 comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
686 searching for changes
686 searching for changes
687 no changes found
687 no changes found
688 [1]
688 [1]
689
689
690 #if serve
690 #if serve
691
691
692 $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
692 $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
693 $ cat hg.pid >> $DAEMON_PIDS
693 $ cat hg.pid >> $DAEMON_PIDS
694
694
695 $ hg incoming http://localhost:$HGPORT
695 $ hg incoming http://localhost:$HGPORT
696 comparing with http://localhost:$HGPORT/
696 comparing with http://localhost:$HGPORT/
697 searching for changes
697 searching for changes
698 1:3816541e5485 (public) [tip ] A
698 1:3816541e5485 (public) [tip ] A
699 $ hg outgoing http://localhost:$HGPORT
699 $ hg outgoing http://localhost:$HGPORT
700 comparing with http://localhost:$HGPORT/
700 comparing with http://localhost:$HGPORT/
701 searching for changes
701 searching for changes
702 no changes found
702 no changes found
703 [1]
703 [1]
704
704
705 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
705 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
706
706
707 #endif
707 #endif
708
708
709 This test issue 3814
709 This test issue 3814
710
710
711 (nothing to push but locally hidden changeset)
711 (nothing to push but locally hidden changeset)
712
712
713 $ cd ..
713 $ cd ..
714 $ hg init repo-issue3814
714 $ hg init repo-issue3814
715 $ cd repo-issue3805
715 $ cd repo-issue3805
716 $ hg push -r 3816541e5485 ../repo-issue3814
716 $ hg push -r 3816541e5485 ../repo-issue3814
717 pushing to ../repo-issue3814
717 pushing to ../repo-issue3814
718 searching for changes
718 searching for changes
719 adding changesets
719 adding changesets
720 adding manifests
720 adding manifests
721 adding file changes
721 adding file changes
722 added 1 changesets with 1 changes to 1 files
722 added 1 changesets with 1 changes to 1 files
723 $ hg out ../repo-issue3814
723 $ hg out ../repo-issue3814
724 comparing with ../repo-issue3814
724 comparing with ../repo-issue3814
725 searching for changes
725 searching for changes
726 no changes found
726 no changes found
727 [1]
727 [1]
728
728
729 Test that a local tag blocks a changeset from being hidden
729 Test that a local tag blocks a changeset from being hidden
730
730
731 $ hg tag -l visible -r 0 --hidden
731 $ hg tag -l visible -r 0 --hidden
732 $ hg log -G
732 $ hg log -G
733 @ 2:3816541e5485 (draft) [tip ] A
733 @ 2:3816541e5485 (draft) [tip ] A
734
734
735 x 0:193e9254ce7e (draft) [visible ] A
735 x 0:193e9254ce7e (draft) [visible ] A
736
736
737 Test that removing a local tag does not cause some commands to fail
737 Test that removing a local tag does not cause some commands to fail
738
738
739 $ hg tag -l -r tip tiptag
739 $ hg tag -l -r tip tiptag
740 $ hg tags
740 $ hg tags
741 tiptag 2:3816541e5485
741 tiptag 2:3816541e5485
742 tip 2:3816541e5485
742 tip 2:3816541e5485
743 visible 0:193e9254ce7e
743 visible 0:193e9254ce7e
744 $ hg --config extensions.strip= strip -r tip --no-backup
744 $ hg --config extensions.strip= strip -r tip --no-backup
745 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
745 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
746 $ hg tags
746 $ hg tags
747 visible 0:193e9254ce7e
747 visible 0:193e9254ce7e
748 tip 0:193e9254ce7e
748 tip 0:193e9254ce7e
General Comments 0
You need to be logged in to leave comments. Login now