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