Show More
@@ -1,600 +1,658 b'' | |||||
1 | $ cat >> $HGRCPATH << EOF |
|
1 | $ cat >> $HGRCPATH << EOF | |
2 | > [extensions] |
|
2 | > [extensions] | |
3 | > graphlog= |
|
3 | > graphlog= | |
4 | > [phases] |
|
4 | > [phases] | |
5 | > # public changeset are not obsolete |
|
5 | > # public changeset are not obsolete | |
6 | > publish=false |
|
6 | > publish=false | |
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 {'date': '0 0', 'user': 'babar'} |
|
57 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 {'date': '0 0', 'user': 'babar'} | |
58 | $ cd .. |
|
58 | $ cd .. | |
59 |
|
59 | |||
60 | Killing a single changeset with replacement |
|
60 | Killing a single changeset with replacement | |
61 |
|
61 | |||
62 | $ hg init tmpb |
|
62 | $ hg init tmpb | |
63 | $ cd tmpb |
|
63 | $ cd tmpb | |
64 | $ mkcommit a |
|
64 | $ mkcommit a | |
65 | $ mkcommit b |
|
65 | $ mkcommit b | |
66 | $ mkcommit original_c |
|
66 | $ mkcommit original_c | |
67 | $ hg up "desc('b')" |
|
67 | $ hg up "desc('b')" | |
68 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
68 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
69 | $ mkcommit new_c |
|
69 | $ mkcommit new_c | |
70 | created new head |
|
70 | created new head | |
71 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
71 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
72 | $ hg debugobsolete --flag 12 `getid original_c` `getid new_c` -d '56 12' |
|
72 | $ hg debugobsolete --flag 12 `getid original_c` `getid new_c` -d '56 12' | |
73 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
73 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
74 | 2:245bde4270cd add original_c |
|
74 | 2:245bde4270cd add original_c | |
75 | $ hg debugobsolete |
|
75 | $ hg debugobsolete | |
76 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} |
|
76 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
77 |
|
77 | |||
78 | do it again (it read the obsstore before adding new changeset) |
|
78 | do it again (it read the obsstore before adding new changeset) | |
79 |
|
79 | |||
80 | $ hg up '.^' |
|
80 | $ hg up '.^' | |
81 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
81 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
82 | $ mkcommit new_2_c |
|
82 | $ mkcommit new_2_c | |
83 | created new head |
|
83 | created new head | |
84 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` |
|
84 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` | |
85 | $ hg debugobsolete |
|
85 | $ hg debugobsolete | |
86 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} |
|
86 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
87 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
87 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
88 |
|
88 | |||
89 | Register two markers with a missing node |
|
89 | Register two markers with a missing node | |
90 |
|
90 | |||
91 | $ hg up '.^' |
|
91 | $ hg up '.^' | |
92 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
92 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
93 | $ mkcommit new_3_c |
|
93 | $ mkcommit new_3_c | |
94 | created new head |
|
94 | created new head | |
95 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 |
|
95 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 | |
96 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` |
|
96 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` | |
97 | $ hg debugobsolete |
|
97 | $ hg debugobsolete | |
98 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} |
|
98 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
99 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
99 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
100 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
100 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
101 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
101 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
102 |
|
102 | |||
103 | Refuse pathological nullid successors |
|
103 | Refuse pathological nullid successors | |
104 | $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 |
|
104 | $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 | |
105 | transaction abort! |
|
105 | transaction abort! | |
106 | rollback completed |
|
106 | rollback completed | |
107 | abort: bad obsolescence marker detected: invalid successors nullid |
|
107 | abort: bad obsolescence marker detected: invalid successors nullid | |
108 | [255] |
|
108 | [255] | |
109 |
|
109 | |||
110 | Check that graphlog detect that a changeset is obsolete: |
|
110 | Check that graphlog detect that a changeset is obsolete: | |
111 |
|
111 | |||
112 | $ hg glog |
|
112 | $ hg glog | |
113 | @ changeset: 5:5601fb93a350 |
|
113 | @ changeset: 5:5601fb93a350 | |
114 | | tag: tip |
|
114 | | tag: tip | |
115 | | parent: 1:7c3bad9141dc |
|
115 | | parent: 1:7c3bad9141dc | |
116 | | user: test |
|
116 | | user: test | |
117 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
117 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
118 | | summary: add new_3_c |
|
118 | | summary: add new_3_c | |
119 | | |
|
119 | | | |
120 | o changeset: 1:7c3bad9141dc |
|
120 | o changeset: 1:7c3bad9141dc | |
121 | | user: test |
|
121 | | user: test | |
122 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
122 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
123 | | summary: add b |
|
123 | | summary: add b | |
124 | | |
|
124 | | | |
125 | o changeset: 0:1f0dee641bb7 |
|
125 | o changeset: 0:1f0dee641bb7 | |
126 | user: test |
|
126 | user: test | |
127 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
127 | date: Thu Jan 01 00:00:00 1970 +0000 | |
128 | summary: add a |
|
128 | summary: add a | |
129 |
|
129 | |||
130 |
|
130 | |||
|
131 | check that heads does not report them | |||
|
132 | ||||
|
133 | $ hg heads | |||
|
134 | changeset: 5:5601fb93a350 | |||
|
135 | tag: tip | |||
|
136 | parent: 1:7c3bad9141dc | |||
|
137 | user: test | |||
|
138 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
139 | summary: add new_3_c | |||
|
140 | ||||
|
141 | $ hg heads --hidden | |||
|
142 | changeset: 5:5601fb93a350 | |||
|
143 | tag: tip | |||
|
144 | parent: 1:7c3bad9141dc | |||
|
145 | user: test | |||
|
146 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
147 | summary: add new_3_c | |||
|
148 | ||||
|
149 | changeset: 4:ca819180edb9 | |||
|
150 | parent: 1:7c3bad9141dc | |||
|
151 | user: test | |||
|
152 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
153 | summary: add new_2_c | |||
|
154 | ||||
|
155 | changeset: 3:cdbce2fbb163 | |||
|
156 | parent: 1:7c3bad9141dc | |||
|
157 | user: test | |||
|
158 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
159 | summary: add new_c | |||
|
160 | ||||
|
161 | changeset: 2:245bde4270cd | |||
|
162 | user: test | |||
|
163 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
164 | summary: add original_c | |||
|
165 | ||||
|
166 | ||||
|
167 | ||||
|
168 | check that summary does not report them | |||
|
169 | ||||
|
170 | $ hg init ../sink | |||
|
171 | $ echo '[paths]' >> .hg/hgrc | |||
|
172 | $ echo 'default=../sink' >> .hg/hgrc | |||
|
173 | $ hg summary --remote | |||
|
174 | parent: 5:5601fb93a350 tip | |||
|
175 | add new_3_c | |||
|
176 | branch: default | |||
|
177 | commit: (clean) | |||
|
178 | update: (current) | |||
|
179 | remote: 3 outgoing | |||
|
180 | ||||
|
181 | $ hg summary --remote --hidden | |||
|
182 | parent: 5:5601fb93a350 tip | |||
|
183 | add new_3_c | |||
|
184 | branch: default | |||
|
185 | commit: (clean) | |||
|
186 | update: 3 new changesets, 4 branch heads (merge) | |||
|
187 | remote: 3 outgoing | |||
|
188 | ||||
131 | Check that public changeset are not accounted as obsolete: |
|
189 | Check that public changeset are not accounted as obsolete: | |
132 |
|
190 | |||
133 | $ hg --hidden phase --public 2 |
|
191 | $ hg --hidden phase --public 2 | |
134 | $ hg --config 'extensions.graphlog=' glog |
|
192 | $ hg --config 'extensions.graphlog=' glog | |
135 | @ changeset: 5:5601fb93a350 |
|
193 | @ changeset: 5:5601fb93a350 | |
136 | | tag: tip |
|
194 | | tag: tip | |
137 | | parent: 1:7c3bad9141dc |
|
195 | | parent: 1:7c3bad9141dc | |
138 | | user: test |
|
196 | | user: test | |
139 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
197 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
140 | | summary: add new_3_c |
|
198 | | summary: add new_3_c | |
141 | | |
|
199 | | | |
142 | | o changeset: 2:245bde4270cd |
|
200 | | o changeset: 2:245bde4270cd | |
143 | |/ user: test |
|
201 | |/ user: test | |
144 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
202 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
145 | | summary: add original_c |
|
203 | | summary: add original_c | |
146 | | |
|
204 | | | |
147 | o changeset: 1:7c3bad9141dc |
|
205 | o changeset: 1:7c3bad9141dc | |
148 | | user: test |
|
206 | | user: test | |
149 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
207 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
150 | | summary: add b |
|
208 | | summary: add b | |
151 | | |
|
209 | | | |
152 | o changeset: 0:1f0dee641bb7 |
|
210 | o changeset: 0:1f0dee641bb7 | |
153 | user: test |
|
211 | user: test | |
154 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
212 | date: Thu Jan 01 00:00:00 1970 +0000 | |
155 | summary: add a |
|
213 | summary: add a | |
156 |
|
214 | |||
157 |
|
215 | |||
158 | And that bumped changeset are detected |
|
216 | And that bumped changeset are detected | |
159 | -------------------------------------- |
|
217 | -------------------------------------- | |
160 |
|
218 | |||
161 | If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also |
|
219 | If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also | |
162 | note that the bumped changeset (5:5601fb93a350) is not a direct successor of |
|
220 | note that the bumped changeset (5:5601fb93a350) is not a direct successor of | |
163 | the public changeset |
|
221 | the public changeset | |
164 |
|
222 | |||
165 | $ hg log --hidden -r 'bumped()' |
|
223 | $ hg log --hidden -r 'bumped()' | |
166 | changeset: 5:5601fb93a350 |
|
224 | changeset: 5:5601fb93a350 | |
167 | tag: tip |
|
225 | tag: tip | |
168 | parent: 1:7c3bad9141dc |
|
226 | parent: 1:7c3bad9141dc | |
169 | user: test |
|
227 | user: test | |
170 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
228 | date: Thu Jan 01 00:00:00 1970 +0000 | |
171 | summary: add new_3_c |
|
229 | summary: add new_3_c | |
172 |
|
230 | |||
173 |
|
231 | |||
174 | And that we can't push bumped changeset |
|
232 | And that we can't push bumped changeset | |
175 |
|
233 | |||
176 | $ hg push ../tmpa -r 0 --force #(make repo related) |
|
234 | $ hg push ../tmpa -r 0 --force #(make repo related) | |
177 | pushing to ../tmpa |
|
235 | pushing to ../tmpa | |
178 | searching for changes |
|
236 | searching for changes | |
179 | warning: repository is unrelated |
|
237 | warning: repository is unrelated | |
180 | adding changesets |
|
238 | adding changesets | |
181 | adding manifests |
|
239 | adding manifests | |
182 | adding file changes |
|
240 | adding file changes | |
183 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
241 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
184 | $ hg push ../tmpa |
|
242 | $ hg push ../tmpa | |
185 | pushing to ../tmpa |
|
243 | pushing to ../tmpa | |
186 | searching for changes |
|
244 | searching for changes | |
187 | abort: push includes bumped changeset: 5601fb93a350! |
|
245 | abort: push includes bumped changeset: 5601fb93a350! | |
188 | [255] |
|
246 | [255] | |
189 |
|
247 | |||
190 | Fixing "bumped" situation |
|
248 | Fixing "bumped" situation | |
191 | We need to create a clone of 5 and add a special marker with a flag |
|
249 | We need to create a clone of 5 and add a special marker with a flag | |
192 |
|
250 | |||
193 | $ hg up '5^' |
|
251 | $ hg up '5^' | |
194 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
252 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
195 | $ hg revert -ar 5 |
|
253 | $ hg revert -ar 5 | |
196 | adding new_3_c |
|
254 | adding new_3_c | |
197 | $ hg ci -m 'add n3w_3_c' |
|
255 | $ hg ci -m 'add n3w_3_c' | |
198 | created new head |
|
256 | created new head | |
199 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` |
|
257 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` | |
200 | $ hg log -r 'bumped()' |
|
258 | $ hg log -r 'bumped()' | |
201 | $ hg log -G |
|
259 | $ hg log -G | |
202 | @ changeset: 6:6f9641995072 |
|
260 | @ changeset: 6:6f9641995072 | |
203 | | tag: tip |
|
261 | | tag: tip | |
204 | | parent: 1:7c3bad9141dc |
|
262 | | parent: 1:7c3bad9141dc | |
205 | | user: test |
|
263 | | user: test | |
206 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
264 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
207 | | summary: add n3w_3_c |
|
265 | | summary: add n3w_3_c | |
208 | | |
|
266 | | | |
209 | | o changeset: 2:245bde4270cd |
|
267 | | o changeset: 2:245bde4270cd | |
210 | |/ user: test |
|
268 | |/ user: test | |
211 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
269 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
212 | | summary: add original_c |
|
270 | | summary: add original_c | |
213 | | |
|
271 | | | |
214 | o changeset: 1:7c3bad9141dc |
|
272 | o changeset: 1:7c3bad9141dc | |
215 | | user: test |
|
273 | | user: test | |
216 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
274 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
217 | | summary: add b |
|
275 | | summary: add b | |
218 | | |
|
276 | | | |
219 | o changeset: 0:1f0dee641bb7 |
|
277 | o changeset: 0:1f0dee641bb7 | |
220 | user: test |
|
278 | user: test | |
221 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
279 | date: Thu Jan 01 00:00:00 1970 +0000 | |
222 | summary: add a |
|
280 | summary: add a | |
223 |
|
281 | |||
224 |
|
282 | |||
225 |
|
283 | |||
226 |
|
284 | |||
227 | $ cd .. |
|
285 | $ cd .. | |
228 |
|
286 | |||
229 | Exchange Test |
|
287 | Exchange Test | |
230 | ============================ |
|
288 | ============================ | |
231 |
|
289 | |||
232 | Destination repo does not have any data |
|
290 | Destination repo does not have any data | |
233 | --------------------------------------- |
|
291 | --------------------------------------- | |
234 |
|
292 | |||
235 | Try to pull markers |
|
293 | Try to pull markers | |
236 | (extinct changeset are excluded but marker are pushed) |
|
294 | (extinct changeset are excluded but marker are pushed) | |
237 |
|
295 | |||
238 | $ hg init tmpc |
|
296 | $ hg init tmpc | |
239 | $ cd tmpc |
|
297 | $ cd tmpc | |
240 | $ hg pull ../tmpb |
|
298 | $ hg pull ../tmpb | |
241 | pulling from ../tmpb |
|
299 | pulling from ../tmpb | |
242 | requesting all changes |
|
300 | requesting all changes | |
243 | adding changesets |
|
301 | adding changesets | |
244 | adding manifests |
|
302 | adding manifests | |
245 | adding file changes |
|
303 | adding file changes | |
246 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
304 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
247 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
305 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
248 | $ hg debugobsolete |
|
306 | $ hg debugobsolete | |
249 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} |
|
307 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
250 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
308 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
251 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
309 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
252 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
310 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
253 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} |
|
311 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} | |
254 |
|
312 | |||
255 | Rollback//Transaction support |
|
313 | Rollback//Transaction support | |
256 |
|
314 | |||
257 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
315 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
258 | $ hg debugobsolete |
|
316 | $ hg debugobsolete | |
259 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} |
|
317 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
260 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
318 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
261 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
319 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
262 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
320 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
263 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} |
|
321 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} | |
264 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 {'date': '1340 0', 'user': 'test'} |
|
322 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 {'date': '1340 0', 'user': 'test'} | |
265 | $ hg rollback -n |
|
323 | $ hg rollback -n | |
266 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
324 | repository tip rolled back to revision 3 (undo debugobsolete) | |
267 | $ hg rollback |
|
325 | $ hg rollback | |
268 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
326 | repository tip rolled back to revision 3 (undo debugobsolete) | |
269 | $ hg debugobsolete |
|
327 | $ hg debugobsolete | |
270 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} |
|
328 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
271 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
329 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
272 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
330 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
273 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
331 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
274 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} |
|
332 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} | |
275 |
|
333 | |||
276 | $ cd .. |
|
334 | $ cd .. | |
277 |
|
335 | |||
278 | Try to pull markers |
|
336 | Try to pull markers | |
279 |
|
337 | |||
280 | $ hg init tmpd |
|
338 | $ hg init tmpd | |
281 | $ hg -R tmpb push tmpd |
|
339 | $ hg -R tmpb push tmpd | |
282 | pushing to tmpd |
|
340 | pushing to tmpd | |
283 | searching for changes |
|
341 | searching for changes | |
284 | adding changesets |
|
342 | adding changesets | |
285 | adding manifests |
|
343 | adding manifests | |
286 | adding file changes |
|
344 | adding file changes | |
287 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
345 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
288 | $ hg -R tmpd debugobsolete |
|
346 | $ hg -R tmpd debugobsolete | |
289 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} |
|
347 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
290 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
348 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
291 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
349 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
292 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
350 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
293 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} |
|
351 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} | |
294 |
|
352 | |||
295 | Check obsolete keys are exchanged only if source has an obsolete store |
|
353 | Check obsolete keys are exchanged only if source has an obsolete store | |
296 |
|
354 | |||
297 | $ hg init empty |
|
355 | $ hg init empty | |
298 | $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd |
|
356 | $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd | |
299 | pushing to tmpd |
|
357 | pushing to tmpd | |
300 | no changes found |
|
358 | no changes found | |
301 | listkeys phases |
|
359 | listkeys phases | |
302 | listkeys bookmarks |
|
360 | listkeys bookmarks | |
303 | [1] |
|
361 | [1] | |
304 |
|
362 | |||
305 | clone support |
|
363 | clone support | |
306 | (markers are copied and extinct changesets are included to allow hardlinks) |
|
364 | (markers are copied and extinct changesets are included to allow hardlinks) | |
307 |
|
365 | |||
308 | $ hg clone tmpb clone-dest |
|
366 | $ hg clone tmpb clone-dest | |
309 | updating to branch default |
|
367 | updating to branch default | |
310 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
368 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
311 | $ hg -R clone-dest log -G --hidden |
|
369 | $ hg -R clone-dest log -G --hidden | |
312 | @ changeset: 6:6f9641995072 |
|
370 | @ changeset: 6:6f9641995072 | |
313 | | tag: tip |
|
371 | | tag: tip | |
314 | | parent: 1:7c3bad9141dc |
|
372 | | parent: 1:7c3bad9141dc | |
315 | | user: test |
|
373 | | user: test | |
316 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
374 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
317 | | summary: add n3w_3_c |
|
375 | | summary: add n3w_3_c | |
318 | | |
|
376 | | | |
319 | | x changeset: 5:5601fb93a350 |
|
377 | | x changeset: 5:5601fb93a350 | |
320 | |/ parent: 1:7c3bad9141dc |
|
378 | |/ parent: 1:7c3bad9141dc | |
321 | | user: test |
|
379 | | user: test | |
322 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
380 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
323 | | summary: add new_3_c |
|
381 | | summary: add new_3_c | |
324 | | |
|
382 | | | |
325 | | x changeset: 4:ca819180edb9 |
|
383 | | x changeset: 4:ca819180edb9 | |
326 | |/ parent: 1:7c3bad9141dc |
|
384 | |/ parent: 1:7c3bad9141dc | |
327 | | user: test |
|
385 | | user: test | |
328 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
386 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
329 | | summary: add new_2_c |
|
387 | | summary: add new_2_c | |
330 | | |
|
388 | | | |
331 | | x changeset: 3:cdbce2fbb163 |
|
389 | | x changeset: 3:cdbce2fbb163 | |
332 | |/ parent: 1:7c3bad9141dc |
|
390 | |/ parent: 1:7c3bad9141dc | |
333 | | user: test |
|
391 | | user: test | |
334 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
392 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
335 | | summary: add new_c |
|
393 | | summary: add new_c | |
336 | | |
|
394 | | | |
337 | | o changeset: 2:245bde4270cd |
|
395 | | o changeset: 2:245bde4270cd | |
338 | |/ user: test |
|
396 | |/ user: test | |
339 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
397 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
340 | | summary: add original_c |
|
398 | | summary: add original_c | |
341 | | |
|
399 | | | |
342 | o changeset: 1:7c3bad9141dc |
|
400 | o changeset: 1:7c3bad9141dc | |
343 | | user: test |
|
401 | | user: test | |
344 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
402 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
345 | | summary: add b |
|
403 | | summary: add b | |
346 | | |
|
404 | | | |
347 | o changeset: 0:1f0dee641bb7 |
|
405 | o changeset: 0:1f0dee641bb7 | |
348 | user: test |
|
406 | user: test | |
349 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
407 | date: Thu Jan 01 00:00:00 1970 +0000 | |
350 | summary: add a |
|
408 | summary: add a | |
351 |
|
409 | |||
352 | $ hg -R clone-dest debugobsolete |
|
410 | $ hg -R clone-dest debugobsolete | |
353 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} |
|
411 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
354 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
412 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
355 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
413 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
356 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
414 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
357 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} |
|
415 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} | |
358 |
|
416 | |||
359 |
|
417 | |||
360 | Destination repo have existing data |
|
418 | Destination repo have existing data | |
361 | --------------------------------------- |
|
419 | --------------------------------------- | |
362 |
|
420 | |||
363 | On pull |
|
421 | On pull | |
364 |
|
422 | |||
365 | $ hg init tmpe |
|
423 | $ hg init tmpe | |
366 | $ cd tmpe |
|
424 | $ cd tmpe | |
367 | $ hg debugobsolete -d '1339 0' 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 |
|
425 | $ hg debugobsolete -d '1339 0' 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 | |
368 | $ hg pull ../tmpb |
|
426 | $ hg pull ../tmpb | |
369 | pulling from ../tmpb |
|
427 | pulling from ../tmpb | |
370 | requesting all changes |
|
428 | requesting all changes | |
371 | adding changesets |
|
429 | adding changesets | |
372 | adding manifests |
|
430 | adding manifests | |
373 | adding file changes |
|
431 | adding file changes | |
374 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
432 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
375 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
433 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
376 | $ hg debugobsolete |
|
434 | $ hg debugobsolete | |
377 | 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'} |
|
435 | 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'} | |
378 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} |
|
436 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
379 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
437 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
380 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
438 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
381 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
439 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
382 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} |
|
440 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} | |
383 |
|
441 | |||
384 |
|
442 | |||
385 | On push |
|
443 | On push | |
386 |
|
444 | |||
387 | $ hg push ../tmpc |
|
445 | $ hg push ../tmpc | |
388 | pushing to ../tmpc |
|
446 | pushing to ../tmpc | |
389 | searching for changes |
|
447 | searching for changes | |
390 | no changes found |
|
448 | no changes found | |
391 | [1] |
|
449 | [1] | |
392 | $ hg -R ../tmpc debugobsolete |
|
450 | $ hg -R ../tmpc debugobsolete | |
393 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} |
|
451 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
394 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
452 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
395 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
453 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
396 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
454 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
397 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} |
|
455 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 {'date': '1338 0', 'user': 'test'} | |
398 | 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'} |
|
456 | 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'} | |
399 |
|
457 | |||
400 | detect outgoing obsolete and unstable |
|
458 | detect outgoing obsolete and unstable | |
401 | --------------------------------------- |
|
459 | --------------------------------------- | |
402 |
|
460 | |||
403 |
|
461 | |||
404 | $ hg glog |
|
462 | $ hg glog | |
405 | o changeset: 3:6f9641995072 |
|
463 | o changeset: 3:6f9641995072 | |
406 | | tag: tip |
|
464 | | tag: tip | |
407 | | parent: 1:7c3bad9141dc |
|
465 | | parent: 1:7c3bad9141dc | |
408 | | user: test |
|
466 | | user: test | |
409 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
467 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
410 | | summary: add n3w_3_c |
|
468 | | summary: add n3w_3_c | |
411 | | |
|
469 | | | |
412 | | o changeset: 2:245bde4270cd |
|
470 | | o changeset: 2:245bde4270cd | |
413 | |/ user: test |
|
471 | |/ user: test | |
414 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
472 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
415 | | summary: add original_c |
|
473 | | summary: add original_c | |
416 | | |
|
474 | | | |
417 | o changeset: 1:7c3bad9141dc |
|
475 | o changeset: 1:7c3bad9141dc | |
418 | | user: test |
|
476 | | user: test | |
419 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
477 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
420 | | summary: add b |
|
478 | | summary: add b | |
421 | | |
|
479 | | | |
422 | o changeset: 0:1f0dee641bb7 |
|
480 | o changeset: 0:1f0dee641bb7 | |
423 | user: test |
|
481 | user: test | |
424 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
482 | date: Thu Jan 01 00:00:00 1970 +0000 | |
425 | summary: add a |
|
483 | summary: add a | |
426 |
|
484 | |||
427 | $ hg up 'desc("n3w_3_c")' |
|
485 | $ hg up 'desc("n3w_3_c")' | |
428 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
486 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
429 | $ mkcommit original_d |
|
487 | $ mkcommit original_d | |
430 | $ mkcommit original_e |
|
488 | $ mkcommit original_e | |
431 | $ hg debugobsolete `getid original_d` -d '0 0' |
|
489 | $ hg debugobsolete `getid original_d` -d '0 0' | |
432 | $ hg log -r 'obsolete()' |
|
490 | $ hg log -r 'obsolete()' | |
433 | changeset: 4:94b33453f93b |
|
491 | changeset: 4:94b33453f93b | |
434 | user: test |
|
492 | user: test | |
435 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
493 | date: Thu Jan 01 00:00:00 1970 +0000 | |
436 | summary: add original_d |
|
494 | summary: add original_d | |
437 |
|
495 | |||
438 | $ hg glog -r '::unstable()' |
|
496 | $ hg glog -r '::unstable()' | |
439 | @ changeset: 5:cda648ca50f5 |
|
497 | @ changeset: 5:cda648ca50f5 | |
440 | | tag: tip |
|
498 | | tag: tip | |
441 | | user: test |
|
499 | | user: test | |
442 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
500 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
443 | | summary: add original_e |
|
501 | | summary: add original_e | |
444 | | |
|
502 | | | |
445 | x changeset: 4:94b33453f93b |
|
503 | x changeset: 4:94b33453f93b | |
446 | | user: test |
|
504 | | user: test | |
447 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
505 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
448 | | summary: add original_d |
|
506 | | summary: add original_d | |
449 | | |
|
507 | | | |
450 | o changeset: 3:6f9641995072 |
|
508 | o changeset: 3:6f9641995072 | |
451 | | parent: 1:7c3bad9141dc |
|
509 | | parent: 1:7c3bad9141dc | |
452 | | user: test |
|
510 | | user: test | |
453 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
511 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
454 | | summary: add n3w_3_c |
|
512 | | summary: add n3w_3_c | |
455 | | |
|
513 | | | |
456 | o changeset: 1:7c3bad9141dc |
|
514 | o changeset: 1:7c3bad9141dc | |
457 | | user: test |
|
515 | | user: test | |
458 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
516 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
459 | | summary: add b |
|
517 | | summary: add b | |
460 | | |
|
518 | | | |
461 | o changeset: 0:1f0dee641bb7 |
|
519 | o changeset: 0:1f0dee641bb7 | |
462 | user: test |
|
520 | user: test | |
463 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
521 | date: Thu Jan 01 00:00:00 1970 +0000 | |
464 | summary: add a |
|
522 | summary: add a | |
465 |
|
523 | |||
466 |
|
524 | |||
467 | refuse to push obsolete changeset |
|
525 | refuse to push obsolete changeset | |
468 |
|
526 | |||
469 | $ hg push ../tmpc/ -r 'desc("original_d")' |
|
527 | $ hg push ../tmpc/ -r 'desc("original_d")' | |
470 | pushing to ../tmpc/ |
|
528 | pushing to ../tmpc/ | |
471 | searching for changes |
|
529 | searching for changes | |
472 | abort: push includes obsolete changeset: 94b33453f93b! |
|
530 | abort: push includes obsolete changeset: 94b33453f93b! | |
473 | [255] |
|
531 | [255] | |
474 |
|
532 | |||
475 | refuse to push unstable changeset |
|
533 | refuse to push unstable changeset | |
476 |
|
534 | |||
477 | $ hg push ../tmpc/ |
|
535 | $ hg push ../tmpc/ | |
478 | pushing to ../tmpc/ |
|
536 | pushing to ../tmpc/ | |
479 | searching for changes |
|
537 | searching for changes | |
480 | abort: push includes unstable changeset: cda648ca50f5! |
|
538 | abort: push includes unstable changeset: cda648ca50f5! | |
481 | [255] |
|
539 | [255] | |
482 |
|
540 | |||
483 | Test that extinct changeset are properly detected |
|
541 | Test that extinct changeset are properly detected | |
484 |
|
542 | |||
485 | $ hg log -r 'extinct()' |
|
543 | $ hg log -r 'extinct()' | |
486 |
|
544 | |||
487 | Don't try to push extinct changeset |
|
545 | Don't try to push extinct changeset | |
488 |
|
546 | |||
489 | $ hg init ../tmpf |
|
547 | $ hg init ../tmpf | |
490 | $ hg out ../tmpf |
|
548 | $ hg out ../tmpf | |
491 | comparing with ../tmpf |
|
549 | comparing with ../tmpf | |
492 | searching for changes |
|
550 | searching for changes | |
493 | changeset: 0:1f0dee641bb7 |
|
551 | changeset: 0:1f0dee641bb7 | |
494 | user: test |
|
552 | user: test | |
495 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
553 | date: Thu Jan 01 00:00:00 1970 +0000 | |
496 | summary: add a |
|
554 | summary: add a | |
497 |
|
555 | |||
498 | changeset: 1:7c3bad9141dc |
|
556 | changeset: 1:7c3bad9141dc | |
499 | user: test |
|
557 | user: test | |
500 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
558 | date: Thu Jan 01 00:00:00 1970 +0000 | |
501 | summary: add b |
|
559 | summary: add b | |
502 |
|
560 | |||
503 | changeset: 2:245bde4270cd |
|
561 | changeset: 2:245bde4270cd | |
504 | user: test |
|
562 | user: test | |
505 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
563 | date: Thu Jan 01 00:00:00 1970 +0000 | |
506 | summary: add original_c |
|
564 | summary: add original_c | |
507 |
|
565 | |||
508 | changeset: 3:6f9641995072 |
|
566 | changeset: 3:6f9641995072 | |
509 | parent: 1:7c3bad9141dc |
|
567 | parent: 1:7c3bad9141dc | |
510 | user: test |
|
568 | user: test | |
511 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
569 | date: Thu Jan 01 00:00:00 1970 +0000 | |
512 | summary: add n3w_3_c |
|
570 | summary: add n3w_3_c | |
513 |
|
571 | |||
514 | changeset: 4:94b33453f93b |
|
572 | changeset: 4:94b33453f93b | |
515 | user: test |
|
573 | user: test | |
516 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
574 | date: Thu Jan 01 00:00:00 1970 +0000 | |
517 | summary: add original_d |
|
575 | summary: add original_d | |
518 |
|
576 | |||
519 | changeset: 5:cda648ca50f5 |
|
577 | changeset: 5:cda648ca50f5 | |
520 | tag: tip |
|
578 | tag: tip | |
521 | user: test |
|
579 | user: test | |
522 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
580 | date: Thu Jan 01 00:00:00 1970 +0000 | |
523 | summary: add original_e |
|
581 | summary: add original_e | |
524 |
|
582 | |||
525 | $ hg push ../tmpf -f # -f because be push unstable too |
|
583 | $ hg push ../tmpf -f # -f because be push unstable too | |
526 | pushing to ../tmpf |
|
584 | pushing to ../tmpf | |
527 | searching for changes |
|
585 | searching for changes | |
528 | adding changesets |
|
586 | adding changesets | |
529 | adding manifests |
|
587 | adding manifests | |
530 | adding file changes |
|
588 | adding file changes | |
531 | added 6 changesets with 6 changes to 6 files (+1 heads) |
|
589 | added 6 changesets with 6 changes to 6 files (+1 heads) | |
532 |
|
590 | |||
533 | no warning displayed |
|
591 | no warning displayed | |
534 |
|
592 | |||
535 | $ hg push ../tmpf |
|
593 | $ hg push ../tmpf | |
536 | pushing to ../tmpf |
|
594 | pushing to ../tmpf | |
537 | searching for changes |
|
595 | searching for changes | |
538 | no changes found |
|
596 | no changes found | |
539 | [1] |
|
597 | [1] | |
540 |
|
598 | |||
541 | Do not warn about new head when the new head is a successors of a remote one |
|
599 | Do not warn about new head when the new head is a successors of a remote one | |
542 |
|
600 | |||
543 | $ hg glog |
|
601 | $ hg glog | |
544 | @ changeset: 5:cda648ca50f5 |
|
602 | @ changeset: 5:cda648ca50f5 | |
545 | | tag: tip |
|
603 | | tag: tip | |
546 | | user: test |
|
604 | | user: test | |
547 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
605 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
548 | | summary: add original_e |
|
606 | | summary: add original_e | |
549 | | |
|
607 | | | |
550 | x changeset: 4:94b33453f93b |
|
608 | x changeset: 4:94b33453f93b | |
551 | | user: test |
|
609 | | user: test | |
552 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
610 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
553 | | summary: add original_d |
|
611 | | summary: add original_d | |
554 | | |
|
612 | | | |
555 | o changeset: 3:6f9641995072 |
|
613 | o changeset: 3:6f9641995072 | |
556 | | parent: 1:7c3bad9141dc |
|
614 | | parent: 1:7c3bad9141dc | |
557 | | user: test |
|
615 | | user: test | |
558 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
616 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
559 | | summary: add n3w_3_c |
|
617 | | summary: add n3w_3_c | |
560 | | |
|
618 | | | |
561 | | o changeset: 2:245bde4270cd |
|
619 | | o changeset: 2:245bde4270cd | |
562 | |/ user: test |
|
620 | |/ user: test | |
563 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
621 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
564 | | summary: add original_c |
|
622 | | summary: add original_c | |
565 | | |
|
623 | | | |
566 | o changeset: 1:7c3bad9141dc |
|
624 | o changeset: 1:7c3bad9141dc | |
567 | | user: test |
|
625 | | user: test | |
568 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
626 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
569 | | summary: add b |
|
627 | | summary: add b | |
570 | | |
|
628 | | | |
571 | o changeset: 0:1f0dee641bb7 |
|
629 | o changeset: 0:1f0dee641bb7 | |
572 | user: test |
|
630 | user: test | |
573 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
631 | date: Thu Jan 01 00:00:00 1970 +0000 | |
574 | summary: add a |
|
632 | summary: add a | |
575 |
|
633 | |||
576 | $ hg up -q 'desc(n3w_3_c)' |
|
634 | $ hg up -q 'desc(n3w_3_c)' | |
577 | $ mkcommit obsolete_e |
|
635 | $ mkcommit obsolete_e | |
578 | created new head |
|
636 | created new head | |
579 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` |
|
637 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` | |
580 | $ hg push ../tmpf |
|
638 | $ hg push ../tmpf | |
581 | pushing to ../tmpf |
|
639 | pushing to ../tmpf | |
582 | searching for changes |
|
640 | searching for changes | |
583 | adding changesets |
|
641 | adding changesets | |
584 | adding manifests |
|
642 | adding manifests | |
585 | adding file changes |
|
643 | adding file changes | |
586 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
644 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
587 |
|
645 | |||
588 | Checking _enable=False warning if obsolete marker exists |
|
646 | Checking _enable=False warning if obsolete marker exists | |
589 |
|
647 | |||
590 | $ echo '[extensions]' >> $HGRCPATH |
|
648 | $ echo '[extensions]' >> $HGRCPATH | |
591 | $ echo "obs=!" >> $HGRCPATH |
|
649 | $ echo "obs=!" >> $HGRCPATH | |
592 | $ hg log -r tip |
|
650 | $ hg log -r tip | |
593 | obsolete feature not enabled but 8 markers found! |
|
651 | obsolete feature not enabled but 8 markers found! | |
594 | changeset: 6:3de5eca88c00 |
|
652 | changeset: 6:3de5eca88c00 | |
595 | tag: tip |
|
653 | tag: tip | |
596 | parent: 3:6f9641995072 |
|
654 | parent: 3:6f9641995072 | |
597 | user: test |
|
655 | user: test | |
598 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
656 | date: Thu Jan 01 00:00:00 1970 +0000 | |
599 | summary: add obsolete_e |
|
657 | summary: add obsolete_e | |
600 |
|
658 |
General Comments 0
You need to be logged in to leave comments.
Login now