Show More
@@ -1,1130 +1,1126 | |||||
1 | $ cat >> $HGRCPATH << EOF |
|
1 | $ cat >> $HGRCPATH << EOF | |
2 | > [phases] |
|
2 | > [phases] | |
3 | > # public changeset are not obsolete |
|
3 | > # public changeset are not obsolete | |
4 | > publish=false |
|
4 | > publish=false | |
5 | > [ui] |
|
5 | > [ui] | |
6 | > logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n" |
|
6 | > logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n" | |
7 | > [experimental] |
|
|||
8 | > # drop me once bundle2 is the default, |
|
|||
9 | > # added to get test change early. |
|
|||
10 | > bundle2-exp = True |
|
|||
11 | > EOF |
|
7 | > EOF | |
12 | $ mkcommit() { |
|
8 | $ mkcommit() { | |
13 | > echo "$1" > "$1" |
|
9 | > echo "$1" > "$1" | |
14 | > hg add "$1" |
|
10 | > hg add "$1" | |
15 | > hg ci -m "add $1" |
|
11 | > hg ci -m "add $1" | |
16 | > } |
|
12 | > } | |
17 | $ getid() { |
|
13 | $ getid() { | |
18 | > hg log -T "{node}\n" --hidden -r "desc('$1')" |
|
14 | > hg log -T "{node}\n" --hidden -r "desc('$1')" | |
19 | > } |
|
15 | > } | |
20 |
|
16 | |||
21 | $ cat > debugkeys.py <<EOF |
|
17 | $ cat > debugkeys.py <<EOF | |
22 | > def reposetup(ui, repo): |
|
18 | > def reposetup(ui, repo): | |
23 | > class debugkeysrepo(repo.__class__): |
|
19 | > class debugkeysrepo(repo.__class__): | |
24 | > def listkeys(self, namespace): |
|
20 | > def listkeys(self, namespace): | |
25 | > ui.write('listkeys %s\n' % (namespace,)) |
|
21 | > ui.write('listkeys %s\n' % (namespace,)) | |
26 | > return super(debugkeysrepo, self).listkeys(namespace) |
|
22 | > return super(debugkeysrepo, self).listkeys(namespace) | |
27 | > |
|
23 | > | |
28 | > if repo.local(): |
|
24 | > if repo.local(): | |
29 | > repo.__class__ = debugkeysrepo |
|
25 | > repo.__class__ = debugkeysrepo | |
30 | > EOF |
|
26 | > EOF | |
31 |
|
27 | |||
32 | $ hg init tmpa |
|
28 | $ hg init tmpa | |
33 | $ cd tmpa |
|
29 | $ cd tmpa | |
34 | $ mkcommit kill_me |
|
30 | $ mkcommit kill_me | |
35 |
|
31 | |||
36 | Checking that the feature is properly disabled |
|
32 | Checking that the feature is properly disabled | |
37 |
|
33 | |||
38 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
|
34 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar | |
39 | abort: creating obsolete markers is not enabled on this repo |
|
35 | abort: creating obsolete markers is not enabled on this repo | |
40 | [255] |
|
36 | [255] | |
41 |
|
37 | |||
42 | Enabling it |
|
38 | Enabling it | |
43 |
|
39 | |||
44 | $ cat >> $HGRCPATH << EOF |
|
40 | $ cat >> $HGRCPATH << EOF | |
45 | > [experimental] |
|
41 | > [experimental] | |
46 | > evolution=createmarkers,exchange |
|
42 | > evolution=createmarkers,exchange | |
47 | > EOF |
|
43 | > EOF | |
48 |
|
44 | |||
49 | Killing a single changeset without replacement |
|
45 | Killing a single changeset without replacement | |
50 |
|
46 | |||
51 | $ hg debugobsolete 0 |
|
47 | $ hg debugobsolete 0 | |
52 | abort: changeset references must be full hexadecimal node identifiers |
|
48 | abort: changeset references must be full hexadecimal node identifiers | |
53 | [255] |
|
49 | [255] | |
54 | $ hg debugobsolete '00' |
|
50 | $ hg debugobsolete '00' | |
55 | abort: changeset references must be full hexadecimal node identifiers |
|
51 | abort: changeset references must be full hexadecimal node identifiers | |
56 | [255] |
|
52 | [255] | |
57 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
|
53 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar | |
58 | $ hg debugobsolete |
|
54 | $ hg debugobsolete | |
59 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} |
|
55 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} | |
60 |
|
56 | |||
61 | (test that mercurial is not confused) |
|
57 | (test that mercurial is not confused) | |
62 |
|
58 | |||
63 | $ hg up null --quiet # having 0 as parent prevents it to be hidden |
|
59 | $ hg up null --quiet # having 0 as parent prevents it to be hidden | |
64 | $ hg tip |
|
60 | $ hg tip | |
65 | -1:000000000000 (public) [tip ] |
|
61 | -1:000000000000 (public) [tip ] | |
66 | $ hg up --hidden tip --quiet |
|
62 | $ hg up --hidden tip --quiet | |
67 |
|
63 | |||
68 | Killing a single changeset with itself should fail |
|
64 | Killing a single changeset with itself should fail | |
69 | (simple local safeguard) |
|
65 | (simple local safeguard) | |
70 |
|
66 | |||
71 | $ hg debugobsolete `getid kill_me` `getid kill_me` |
|
67 | $ hg debugobsolete `getid kill_me` `getid kill_me` | |
72 | abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0 |
|
68 | abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0 | |
73 | [255] |
|
69 | [255] | |
74 |
|
70 | |||
75 | $ cd .. |
|
71 | $ cd .. | |
76 |
|
72 | |||
77 | Killing a single changeset with replacement |
|
73 | Killing a single changeset with replacement | |
78 | (and testing the format option) |
|
74 | (and testing the format option) | |
79 |
|
75 | |||
80 | $ hg init tmpb |
|
76 | $ hg init tmpb | |
81 | $ cd tmpb |
|
77 | $ cd tmpb | |
82 | $ mkcommit a |
|
78 | $ mkcommit a | |
83 | $ mkcommit b |
|
79 | $ mkcommit b | |
84 | $ mkcommit original_c |
|
80 | $ mkcommit original_c | |
85 | $ hg up "desc('b')" |
|
81 | $ hg up "desc('b')" | |
86 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
82 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
87 | $ mkcommit new_c |
|
83 | $ mkcommit new_c | |
88 | created new head |
|
84 | created new head | |
89 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
85 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
90 | $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' |
|
86 | $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' | |
91 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
87 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
92 | 2:245bde4270cd add original_c |
|
88 | 2:245bde4270cd add original_c | |
93 | $ hg debugrevlog -cd |
|
89 | $ hg debugrevlog -cd | |
94 | # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen |
|
90 | # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen | |
95 | 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0 |
|
91 | 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0 | |
96 | 1 0 -1 59 118 59 59 0 0 58 116 0 1 0 |
|
92 | 1 0 -1 59 118 59 59 0 0 58 116 0 1 0 | |
97 | 2 1 -1 118 193 118 118 59 0 76 192 0 1 0 |
|
93 | 2 1 -1 118 193 118 118 59 0 76 192 0 1 0 | |
98 | 3 1 -1 193 260 193 193 59 0 66 258 0 2 0 |
|
94 | 3 1 -1 193 260 193 193 59 0 66 258 0 2 0 | |
99 | $ hg debugobsolete |
|
95 | $ hg debugobsolete | |
100 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
96 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
101 |
|
97 | |||
102 | (check for version number of the obsstore) |
|
98 | (check for version number of the obsstore) | |
103 |
|
99 | |||
104 | $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null |
|
100 | $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null | |
105 | \x00 (no-eol) (esc) |
|
101 | \x00 (no-eol) (esc) | |
106 |
|
102 | |||
107 | do it again (it read the obsstore before adding new changeset) |
|
103 | do it again (it read the obsstore before adding new changeset) | |
108 |
|
104 | |||
109 | $ hg up '.^' |
|
105 | $ hg up '.^' | |
110 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
106 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
111 | $ mkcommit new_2_c |
|
107 | $ mkcommit new_2_c | |
112 | created new head |
|
108 | created new head | |
113 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` |
|
109 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` | |
114 | $ hg debugobsolete |
|
110 | $ hg debugobsolete | |
115 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
111 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
116 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
112 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
117 |
|
113 | |||
118 | Register two markers with a missing node |
|
114 | Register two markers with a missing node | |
119 |
|
115 | |||
120 | $ hg up '.^' |
|
116 | $ hg up '.^' | |
121 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
117 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
122 | $ mkcommit new_3_c |
|
118 | $ mkcommit new_3_c | |
123 | created new head |
|
119 | created new head | |
124 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 |
|
120 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 | |
125 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` |
|
121 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` | |
126 | $ hg debugobsolete |
|
122 | $ hg debugobsolete | |
127 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
123 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
128 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
124 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
129 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
125 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
130 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
126 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
131 |
|
127 | |||
132 | Test the --index option of debugobsolete command |
|
128 | Test the --index option of debugobsolete command | |
133 | $ hg debugobsolete --index |
|
129 | $ hg debugobsolete --index | |
134 | 0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
130 | 0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
135 | 1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
131 | 1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
136 | 2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
132 | 2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
137 | 3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
133 | 3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
138 |
|
134 | |||
139 | Refuse pathological nullid successors |
|
135 | Refuse pathological nullid successors | |
140 | $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 |
|
136 | $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 | |
141 | transaction abort! |
|
137 | transaction abort! | |
142 | rollback completed |
|
138 | rollback completed | |
143 | abort: bad obsolescence marker detected: invalid successors nullid |
|
139 | abort: bad obsolescence marker detected: invalid successors nullid | |
144 | [255] |
|
140 | [255] | |
145 |
|
141 | |||
146 | Check that graphlog detect that a changeset is obsolete: |
|
142 | Check that graphlog detect that a changeset is obsolete: | |
147 |
|
143 | |||
148 | $ hg log -G |
|
144 | $ hg log -G | |
149 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
145 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c | |
150 | | |
|
146 | | | |
151 | o 1:7c3bad9141dc (draft) [ ] add b |
|
147 | o 1:7c3bad9141dc (draft) [ ] add b | |
152 | | |
|
148 | | | |
153 | o 0:1f0dee641bb7 (draft) [ ] add a |
|
149 | o 0:1f0dee641bb7 (draft) [ ] add a | |
154 |
|
150 | |||
155 |
|
151 | |||
156 | check that heads does not report them |
|
152 | check that heads does not report them | |
157 |
|
153 | |||
158 | $ hg heads |
|
154 | $ hg heads | |
159 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
155 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
160 | $ hg heads --hidden |
|
156 | $ hg heads --hidden | |
161 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
157 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
162 | 4:ca819180edb9 (draft) [ ] add new_2_c |
|
158 | 4:ca819180edb9 (draft) [ ] add new_2_c | |
163 | 3:cdbce2fbb163 (draft) [ ] add new_c |
|
159 | 3:cdbce2fbb163 (draft) [ ] add new_c | |
164 | 2:245bde4270cd (draft) [ ] add original_c |
|
160 | 2:245bde4270cd (draft) [ ] add original_c | |
165 |
|
161 | |||
166 |
|
162 | |||
167 | check that summary does not report them |
|
163 | check that summary does not report them | |
168 |
|
164 | |||
169 | $ hg init ../sink |
|
165 | $ hg init ../sink | |
170 | $ echo '[paths]' >> .hg/hgrc |
|
166 | $ echo '[paths]' >> .hg/hgrc | |
171 | $ echo 'default=../sink' >> .hg/hgrc |
|
167 | $ echo 'default=../sink' >> .hg/hgrc | |
172 | $ hg summary --remote |
|
168 | $ hg summary --remote | |
173 | parent: 5:5601fb93a350 tip |
|
169 | parent: 5:5601fb93a350 tip | |
174 | add new_3_c |
|
170 | add new_3_c | |
175 | branch: default |
|
171 | branch: default | |
176 | commit: (clean) |
|
172 | commit: (clean) | |
177 | update: (current) |
|
173 | update: (current) | |
178 | phases: 3 draft |
|
174 | phases: 3 draft | |
179 | remote: 3 outgoing |
|
175 | remote: 3 outgoing | |
180 |
|
176 | |||
181 | $ hg summary --remote --hidden |
|
177 | $ hg summary --remote --hidden | |
182 | parent: 5:5601fb93a350 tip |
|
178 | parent: 5:5601fb93a350 tip | |
183 | add new_3_c |
|
179 | add new_3_c | |
184 | branch: default |
|
180 | branch: default | |
185 | commit: (clean) |
|
181 | commit: (clean) | |
186 | update: 3 new changesets, 4 branch heads (merge) |
|
182 | update: 3 new changesets, 4 branch heads (merge) | |
187 | phases: 6 draft |
|
183 | phases: 6 draft | |
188 | remote: 3 outgoing |
|
184 | remote: 3 outgoing | |
189 |
|
185 | |||
190 | check that various commands work well with filtering |
|
186 | check that various commands work well with filtering | |
191 |
|
187 | |||
192 | $ hg tip |
|
188 | $ hg tip | |
193 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
189 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
194 | $ hg log -r 6 |
|
190 | $ hg log -r 6 | |
195 | abort: unknown revision '6'! |
|
191 | abort: unknown revision '6'! | |
196 | [255] |
|
192 | [255] | |
197 | $ hg log -r 4 |
|
193 | $ hg log -r 4 | |
198 | abort: hidden revision '4'! |
|
194 | abort: hidden revision '4'! | |
199 | (use --hidden to access hidden revisions) |
|
195 | (use --hidden to access hidden revisions) | |
200 | [255] |
|
196 | [255] | |
201 | $ hg debugrevspec 'rev(6)' |
|
197 | $ hg debugrevspec 'rev(6)' | |
202 | $ hg debugrevspec 'rev(4)' |
|
198 | $ hg debugrevspec 'rev(4)' | |
203 | $ hg debugrevspec 'null' |
|
199 | $ hg debugrevspec 'null' | |
204 | -1 |
|
200 | -1 | |
205 |
|
201 | |||
206 | Check that public changeset are not accounted as obsolete: |
|
202 | Check that public changeset are not accounted as obsolete: | |
207 |
|
203 | |||
208 | $ hg --hidden phase --public 2 |
|
204 | $ hg --hidden phase --public 2 | |
209 | $ hg log -G |
|
205 | $ hg log -G | |
210 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
206 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c | |
211 | | |
|
207 | | | |
212 | | o 2:245bde4270cd (public) [ ] add original_c |
|
208 | | o 2:245bde4270cd (public) [ ] add original_c | |
213 | |/ |
|
209 | |/ | |
214 | o 1:7c3bad9141dc (public) [ ] add b |
|
210 | o 1:7c3bad9141dc (public) [ ] add b | |
215 | | |
|
211 | | | |
216 | o 0:1f0dee641bb7 (public) [ ] add a |
|
212 | o 0:1f0dee641bb7 (public) [ ] add a | |
217 |
|
213 | |||
218 |
|
214 | |||
219 | And that bumped changeset are detected |
|
215 | And that bumped changeset are detected | |
220 | -------------------------------------- |
|
216 | -------------------------------------- | |
221 |
|
217 | |||
222 | If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also |
|
218 | If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also | |
223 | note that the bumped changeset (5:5601fb93a350) is not a direct successor of |
|
219 | note that the bumped changeset (5:5601fb93a350) is not a direct successor of | |
224 | the public changeset |
|
220 | the public changeset | |
225 |
|
221 | |||
226 | $ hg log --hidden -r 'bumped()' |
|
222 | $ hg log --hidden -r 'bumped()' | |
227 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
223 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
228 |
|
224 | |||
229 | And that we can't push bumped changeset |
|
225 | And that we can't push bumped changeset | |
230 |
|
226 | |||
231 | $ hg push ../tmpa -r 0 --force #(make repo related) |
|
227 | $ hg push ../tmpa -r 0 --force #(make repo related) | |
232 | pushing to ../tmpa |
|
228 | pushing to ../tmpa | |
233 | searching for changes |
|
229 | searching for changes | |
234 | warning: repository is unrelated |
|
230 | warning: repository is unrelated | |
235 | adding changesets |
|
231 | adding changesets | |
236 | adding manifests |
|
232 | adding manifests | |
237 | adding file changes |
|
233 | adding file changes | |
238 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
234 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
239 | $ hg push ../tmpa |
|
235 | $ hg push ../tmpa | |
240 | pushing to ../tmpa |
|
236 | pushing to ../tmpa | |
241 | searching for changes |
|
237 | searching for changes | |
242 | abort: push includes bumped changeset: 5601fb93a350! |
|
238 | abort: push includes bumped changeset: 5601fb93a350! | |
243 | [255] |
|
239 | [255] | |
244 |
|
240 | |||
245 | Fixing "bumped" situation |
|
241 | Fixing "bumped" situation | |
246 | We need to create a clone of 5 and add a special marker with a flag |
|
242 | We need to create a clone of 5 and add a special marker with a flag | |
247 |
|
243 | |||
248 | $ hg summary |
|
244 | $ hg summary | |
249 | parent: 5:5601fb93a350 tip |
|
245 | parent: 5:5601fb93a350 tip | |
250 | add new_3_c |
|
246 | add new_3_c | |
251 | branch: default |
|
247 | branch: default | |
252 | commit: (clean) |
|
248 | commit: (clean) | |
253 | update: 1 new changesets, 2 branch heads (merge) |
|
249 | update: 1 new changesets, 2 branch heads (merge) | |
254 | phases: 1 draft |
|
250 | phases: 1 draft | |
255 | bumped: 1 changesets |
|
251 | bumped: 1 changesets | |
256 | $ hg up '5^' |
|
252 | $ hg up '5^' | |
257 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
253 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
258 | $ hg revert -ar 5 |
|
254 | $ hg revert -ar 5 | |
259 | adding new_3_c |
|
255 | adding new_3_c | |
260 | $ hg ci -m 'add n3w_3_c' |
|
256 | $ hg ci -m 'add n3w_3_c' | |
261 | created new head |
|
257 | created new head | |
262 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` |
|
258 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` | |
263 | $ hg log -r 'bumped()' |
|
259 | $ hg log -r 'bumped()' | |
264 | $ hg log -G |
|
260 | $ hg log -G | |
265 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
261 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
266 | | |
|
262 | | | |
267 | | o 2:245bde4270cd (public) [ ] add original_c |
|
263 | | o 2:245bde4270cd (public) [ ] add original_c | |
268 | |/ |
|
264 | |/ | |
269 | o 1:7c3bad9141dc (public) [ ] add b |
|
265 | o 1:7c3bad9141dc (public) [ ] add b | |
270 | | |
|
266 | | | |
271 | o 0:1f0dee641bb7 (public) [ ] add a |
|
267 | o 0:1f0dee641bb7 (public) [ ] add a | |
272 |
|
268 | |||
273 |
|
269 | |||
274 | $ cd .. |
|
270 | $ cd .. | |
275 |
|
271 | |||
276 | Revision 0 is hidden |
|
272 | Revision 0 is hidden | |
277 | -------------------- |
|
273 | -------------------- | |
278 |
|
274 | |||
279 | $ hg init rev0hidden |
|
275 | $ hg init rev0hidden | |
280 | $ cd rev0hidden |
|
276 | $ cd rev0hidden | |
281 |
|
277 | |||
282 | $ mkcommit kill0 |
|
278 | $ mkcommit kill0 | |
283 | $ hg up -q null |
|
279 | $ hg up -q null | |
284 | $ hg debugobsolete `getid kill0` |
|
280 | $ hg debugobsolete `getid kill0` | |
285 | $ mkcommit a |
|
281 | $ mkcommit a | |
286 | $ mkcommit b |
|
282 | $ mkcommit b | |
287 |
|
283 | |||
288 | Should pick the first visible revision as "repo" node |
|
284 | Should pick the first visible revision as "repo" node | |
289 |
|
285 | |||
290 | $ hg archive ../archive-null |
|
286 | $ hg archive ../archive-null | |
291 | $ cat ../archive-null/.hg_archival.txt |
|
287 | $ cat ../archive-null/.hg_archival.txt | |
292 | repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e |
|
288 | repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e | |
293 | node: 7c3bad9141dcb46ff89abf5f61856facd56e476c |
|
289 | node: 7c3bad9141dcb46ff89abf5f61856facd56e476c | |
294 | branch: default |
|
290 | branch: default | |
295 | latesttag: null |
|
291 | latesttag: null | |
296 | latesttagdistance: 2 |
|
292 | latesttagdistance: 2 | |
297 | changessincelatesttag: 2 |
|
293 | changessincelatesttag: 2 | |
298 |
|
294 | |||
299 |
|
295 | |||
300 | $ cd .. |
|
296 | $ cd .. | |
301 |
|
297 | |||
302 | Exchange Test |
|
298 | Exchange Test | |
303 | ============================ |
|
299 | ============================ | |
304 |
|
300 | |||
305 | Destination repo does not have any data |
|
301 | Destination repo does not have any data | |
306 | --------------------------------------- |
|
302 | --------------------------------------- | |
307 |
|
303 | |||
308 | Simple incoming test |
|
304 | Simple incoming test | |
309 |
|
305 | |||
310 | $ hg init tmpc |
|
306 | $ hg init tmpc | |
311 | $ cd tmpc |
|
307 | $ cd tmpc | |
312 | $ hg incoming ../tmpb |
|
308 | $ hg incoming ../tmpb | |
313 | comparing with ../tmpb |
|
309 | comparing with ../tmpb | |
314 | 0:1f0dee641bb7 (public) [ ] add a |
|
310 | 0:1f0dee641bb7 (public) [ ] add a | |
315 | 1:7c3bad9141dc (public) [ ] add b |
|
311 | 1:7c3bad9141dc (public) [ ] add b | |
316 | 2:245bde4270cd (public) [ ] add original_c |
|
312 | 2:245bde4270cd (public) [ ] add original_c | |
317 | 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
313 | 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
318 |
|
314 | |||
319 | Try to pull markers |
|
315 | Try to pull markers | |
320 | (extinct changeset are excluded but marker are pushed) |
|
316 | (extinct changeset are excluded but marker are pushed) | |
321 |
|
317 | |||
322 | $ hg pull ../tmpb |
|
318 | $ hg pull ../tmpb | |
323 | pulling from ../tmpb |
|
319 | pulling from ../tmpb | |
324 | requesting all changes |
|
320 | requesting all changes | |
325 | adding changesets |
|
321 | adding changesets | |
326 | adding manifests |
|
322 | adding manifests | |
327 | adding file changes |
|
323 | adding file changes | |
328 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
324 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
329 | 5 new obsolescence markers |
|
325 | 5 new obsolescence markers | |
330 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
326 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
331 | $ hg debugobsolete |
|
327 | $ hg debugobsolete | |
332 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
328 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
333 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
329 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
334 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
330 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
335 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
331 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
336 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
332 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
337 |
|
333 | |||
338 | Rollback//Transaction support |
|
334 | Rollback//Transaction support | |
339 |
|
335 | |||
340 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
336 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
341 | $ hg debugobsolete |
|
337 | $ hg debugobsolete | |
342 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
338 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
343 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
339 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
344 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
340 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
345 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
341 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
346 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
342 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
347 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'} |
|
343 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'} | |
348 | $ hg rollback -n |
|
344 | $ hg rollback -n | |
349 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
345 | repository tip rolled back to revision 3 (undo debugobsolete) | |
350 | $ hg rollback |
|
346 | $ hg rollback | |
351 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
347 | repository tip rolled back to revision 3 (undo debugobsolete) | |
352 | $ hg debugobsolete |
|
348 | $ hg debugobsolete | |
353 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
349 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
354 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
350 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
355 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
351 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
356 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
352 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
357 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
353 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
358 |
|
354 | |||
359 | $ cd .. |
|
355 | $ cd .. | |
360 |
|
356 | |||
361 | Try to push markers |
|
357 | Try to push markers | |
362 |
|
358 | |||
363 | $ hg init tmpd |
|
359 | $ hg init tmpd | |
364 | $ hg -R tmpb push tmpd |
|
360 | $ hg -R tmpb push tmpd | |
365 | pushing to tmpd |
|
361 | pushing to tmpd | |
366 | searching for changes |
|
362 | searching for changes | |
367 | adding changesets |
|
363 | adding changesets | |
368 | adding manifests |
|
364 | adding manifests | |
369 | adding file changes |
|
365 | adding file changes | |
370 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
366 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
371 | 5 new obsolescence markers |
|
367 | 5 new obsolescence markers | |
372 | $ hg -R tmpd debugobsolete | sort |
|
368 | $ hg -R tmpd debugobsolete | sort | |
373 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
369 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
374 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
370 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
375 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
371 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
376 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
372 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
377 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
373 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
378 |
|
374 | |||
379 | Check obsolete keys are exchanged only if source has an obsolete store |
|
375 | Check obsolete keys are exchanged only if source has an obsolete store | |
380 |
|
376 | |||
381 | $ hg init empty |
|
377 | $ hg init empty | |
382 | $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd |
|
378 | $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd | |
383 | pushing to tmpd |
|
379 | pushing to tmpd | |
384 | listkeys phases |
|
380 | listkeys phases | |
385 | listkeys bookmarks |
|
381 | listkeys bookmarks | |
386 | no changes found |
|
382 | no changes found | |
387 | listkeys phases |
|
383 | listkeys phases | |
388 | [1] |
|
384 | [1] | |
389 |
|
385 | |||
390 | clone support |
|
386 | clone support | |
391 | (markers are copied and extinct changesets are included to allow hardlinks) |
|
387 | (markers are copied and extinct changesets are included to allow hardlinks) | |
392 |
|
388 | |||
393 | $ hg clone tmpb clone-dest |
|
389 | $ hg clone tmpb clone-dest | |
394 | updating to branch default |
|
390 | updating to branch default | |
395 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
391 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
396 | $ hg -R clone-dest log -G --hidden |
|
392 | $ hg -R clone-dest log -G --hidden | |
397 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
393 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
398 | | |
|
394 | | | |
399 | | x 5:5601fb93a350 (draft) [ ] add new_3_c |
|
395 | | x 5:5601fb93a350 (draft) [ ] add new_3_c | |
400 | |/ |
|
396 | |/ | |
401 | | x 4:ca819180edb9 (draft) [ ] add new_2_c |
|
397 | | x 4:ca819180edb9 (draft) [ ] add new_2_c | |
402 | |/ |
|
398 | |/ | |
403 | | x 3:cdbce2fbb163 (draft) [ ] add new_c |
|
399 | | x 3:cdbce2fbb163 (draft) [ ] add new_c | |
404 | |/ |
|
400 | |/ | |
405 | | o 2:245bde4270cd (public) [ ] add original_c |
|
401 | | o 2:245bde4270cd (public) [ ] add original_c | |
406 | |/ |
|
402 | |/ | |
407 | o 1:7c3bad9141dc (public) [ ] add b |
|
403 | o 1:7c3bad9141dc (public) [ ] add b | |
408 | | |
|
404 | | | |
409 | o 0:1f0dee641bb7 (public) [ ] add a |
|
405 | o 0:1f0dee641bb7 (public) [ ] add a | |
410 |
|
406 | |||
411 | $ hg -R clone-dest debugobsolete |
|
407 | $ hg -R clone-dest debugobsolete | |
412 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
408 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
413 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
409 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
414 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
410 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
415 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
411 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
416 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
412 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
417 |
|
413 | |||
418 |
|
414 | |||
419 | Destination repo have existing data |
|
415 | Destination repo have existing data | |
420 | --------------------------------------- |
|
416 | --------------------------------------- | |
421 |
|
417 | |||
422 | On pull |
|
418 | On pull | |
423 |
|
419 | |||
424 | $ hg init tmpe |
|
420 | $ hg init tmpe | |
425 | $ cd tmpe |
|
421 | $ cd tmpe | |
426 | $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 |
|
422 | $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 | |
427 | $ hg pull ../tmpb |
|
423 | $ hg pull ../tmpb | |
428 | pulling from ../tmpb |
|
424 | pulling from ../tmpb | |
429 | requesting all changes |
|
425 | requesting all changes | |
430 | adding changesets |
|
426 | adding changesets | |
431 | adding manifests |
|
427 | adding manifests | |
432 | adding file changes |
|
428 | adding file changes | |
433 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
429 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
434 | 5 new obsolescence markers |
|
430 | 5 new obsolescence markers | |
435 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
431 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
436 | $ hg debugobsolete |
|
432 | $ hg debugobsolete | |
437 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
433 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
438 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
434 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
439 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
435 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
440 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
436 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
441 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
437 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
442 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
438 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
443 |
|
439 | |||
444 |
|
440 | |||
445 | On push |
|
441 | On push | |
446 |
|
442 | |||
447 | $ hg push ../tmpc |
|
443 | $ hg push ../tmpc | |
448 | pushing to ../tmpc |
|
444 | pushing to ../tmpc | |
449 | searching for changes |
|
445 | searching for changes | |
450 | no changes found |
|
446 | no changes found | |
451 | 1 new obsolescence markers |
|
447 | 1 new obsolescence markers | |
452 | [1] |
|
448 | [1] | |
453 | $ hg -R ../tmpc debugobsolete |
|
449 | $ hg -R ../tmpc debugobsolete | |
454 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
450 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
455 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
451 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
456 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
452 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
457 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
453 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
458 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
454 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
459 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
455 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
460 |
|
456 | |||
461 | detect outgoing obsolete and unstable |
|
457 | detect outgoing obsolete and unstable | |
462 | --------------------------------------- |
|
458 | --------------------------------------- | |
463 |
|
459 | |||
464 |
|
460 | |||
465 | $ hg log -G |
|
461 | $ hg log -G | |
466 | o 3:6f9641995072 (draft) [tip ] add n3w_3_c |
|
462 | o 3:6f9641995072 (draft) [tip ] add n3w_3_c | |
467 | | |
|
463 | | | |
468 | | o 2:245bde4270cd (public) [ ] add original_c |
|
464 | | o 2:245bde4270cd (public) [ ] add original_c | |
469 | |/ |
|
465 | |/ | |
470 | o 1:7c3bad9141dc (public) [ ] add b |
|
466 | o 1:7c3bad9141dc (public) [ ] add b | |
471 | | |
|
467 | | | |
472 | o 0:1f0dee641bb7 (public) [ ] add a |
|
468 | o 0:1f0dee641bb7 (public) [ ] add a | |
473 |
|
469 | |||
474 | $ hg up 'desc("n3w_3_c")' |
|
470 | $ hg up 'desc("n3w_3_c")' | |
475 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
471 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
476 | $ mkcommit original_d |
|
472 | $ mkcommit original_d | |
477 | $ mkcommit original_e |
|
473 | $ mkcommit original_e | |
478 | $ hg debugobsolete --record-parents `getid original_d` -d '0 0' |
|
474 | $ hg debugobsolete --record-parents `getid original_d` -d '0 0' | |
479 | $ hg debugobsolete | grep `getid original_d` |
|
475 | $ hg debugobsolete | grep `getid original_d` | |
480 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
476 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
481 | $ hg log -r 'obsolete()' |
|
477 | $ hg log -r 'obsolete()' | |
482 | 4:94b33453f93b (draft) [ ] add original_d |
|
478 | 4:94b33453f93b (draft) [ ] add original_d | |
483 | $ hg summary |
|
479 | $ hg summary | |
484 | parent: 5:cda648ca50f5 tip |
|
480 | parent: 5:cda648ca50f5 tip | |
485 | add original_e |
|
481 | add original_e | |
486 | branch: default |
|
482 | branch: default | |
487 | commit: (clean) |
|
483 | commit: (clean) | |
488 | update: 1 new changesets, 2 branch heads (merge) |
|
484 | update: 1 new changesets, 2 branch heads (merge) | |
489 | phases: 3 draft |
|
485 | phases: 3 draft | |
490 | unstable: 1 changesets |
|
486 | unstable: 1 changesets | |
491 | $ hg log -G -r '::unstable()' |
|
487 | $ hg log -G -r '::unstable()' | |
492 | @ 5:cda648ca50f5 (draft) [tip ] add original_e |
|
488 | @ 5:cda648ca50f5 (draft) [tip ] add original_e | |
493 | | |
|
489 | | | |
494 | x 4:94b33453f93b (draft) [ ] add original_d |
|
490 | x 4:94b33453f93b (draft) [ ] add original_d | |
495 | | |
|
491 | | | |
496 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
492 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
497 | | |
|
493 | | | |
498 | o 1:7c3bad9141dc (public) [ ] add b |
|
494 | o 1:7c3bad9141dc (public) [ ] add b | |
499 | | |
|
495 | | | |
500 | o 0:1f0dee641bb7 (public) [ ] add a |
|
496 | o 0:1f0dee641bb7 (public) [ ] add a | |
501 |
|
497 | |||
502 |
|
498 | |||
503 | refuse to push obsolete changeset |
|
499 | refuse to push obsolete changeset | |
504 |
|
500 | |||
505 | $ hg push ../tmpc/ -r 'desc("original_d")' |
|
501 | $ hg push ../tmpc/ -r 'desc("original_d")' | |
506 | pushing to ../tmpc/ |
|
502 | pushing to ../tmpc/ | |
507 | searching for changes |
|
503 | searching for changes | |
508 | abort: push includes obsolete changeset: 94b33453f93b! |
|
504 | abort: push includes obsolete changeset: 94b33453f93b! | |
509 | [255] |
|
505 | [255] | |
510 |
|
506 | |||
511 | refuse to push unstable changeset |
|
507 | refuse to push unstable changeset | |
512 |
|
508 | |||
513 | $ hg push ../tmpc/ |
|
509 | $ hg push ../tmpc/ | |
514 | pushing to ../tmpc/ |
|
510 | pushing to ../tmpc/ | |
515 | searching for changes |
|
511 | searching for changes | |
516 | abort: push includes unstable changeset: cda648ca50f5! |
|
512 | abort: push includes unstable changeset: cda648ca50f5! | |
517 | [255] |
|
513 | [255] | |
518 |
|
514 | |||
519 | Test that extinct changeset are properly detected |
|
515 | Test that extinct changeset are properly detected | |
520 |
|
516 | |||
521 | $ hg log -r 'extinct()' |
|
517 | $ hg log -r 'extinct()' | |
522 |
|
518 | |||
523 | Don't try to push extinct changeset |
|
519 | Don't try to push extinct changeset | |
524 |
|
520 | |||
525 | $ hg init ../tmpf |
|
521 | $ hg init ../tmpf | |
526 | $ hg out ../tmpf |
|
522 | $ hg out ../tmpf | |
527 | comparing with ../tmpf |
|
523 | comparing with ../tmpf | |
528 | searching for changes |
|
524 | searching for changes | |
529 | 0:1f0dee641bb7 (public) [ ] add a |
|
525 | 0:1f0dee641bb7 (public) [ ] add a | |
530 | 1:7c3bad9141dc (public) [ ] add b |
|
526 | 1:7c3bad9141dc (public) [ ] add b | |
531 | 2:245bde4270cd (public) [ ] add original_c |
|
527 | 2:245bde4270cd (public) [ ] add original_c | |
532 | 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
528 | 3:6f9641995072 (draft) [ ] add n3w_3_c | |
533 | 4:94b33453f93b (draft) [ ] add original_d |
|
529 | 4:94b33453f93b (draft) [ ] add original_d | |
534 | 5:cda648ca50f5 (draft) [tip ] add original_e |
|
530 | 5:cda648ca50f5 (draft) [tip ] add original_e | |
535 | $ hg push ../tmpf -f # -f because be push unstable too |
|
531 | $ hg push ../tmpf -f # -f because be push unstable too | |
536 | pushing to ../tmpf |
|
532 | pushing to ../tmpf | |
537 | searching for changes |
|
533 | searching for changes | |
538 | adding changesets |
|
534 | adding changesets | |
539 | adding manifests |
|
535 | adding manifests | |
540 | adding file changes |
|
536 | adding file changes | |
541 | added 6 changesets with 6 changes to 6 files (+1 heads) |
|
537 | added 6 changesets with 6 changes to 6 files (+1 heads) | |
542 | 7 new obsolescence markers |
|
538 | 7 new obsolescence markers | |
543 |
|
539 | |||
544 | no warning displayed |
|
540 | no warning displayed | |
545 |
|
541 | |||
546 | $ hg push ../tmpf |
|
542 | $ hg push ../tmpf | |
547 | pushing to ../tmpf |
|
543 | pushing to ../tmpf | |
548 | searching for changes |
|
544 | searching for changes | |
549 | no changes found |
|
545 | no changes found | |
550 | [1] |
|
546 | [1] | |
551 |
|
547 | |||
552 | Do not warn about new head when the new head is a successors of a remote one |
|
548 | Do not warn about new head when the new head is a successors of a remote one | |
553 |
|
549 | |||
554 | $ hg log -G |
|
550 | $ hg log -G | |
555 | @ 5:cda648ca50f5 (draft) [tip ] add original_e |
|
551 | @ 5:cda648ca50f5 (draft) [tip ] add original_e | |
556 | | |
|
552 | | | |
557 | x 4:94b33453f93b (draft) [ ] add original_d |
|
553 | x 4:94b33453f93b (draft) [ ] add original_d | |
558 | | |
|
554 | | | |
559 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
555 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
560 | | |
|
556 | | | |
561 | | o 2:245bde4270cd (public) [ ] add original_c |
|
557 | | o 2:245bde4270cd (public) [ ] add original_c | |
562 | |/ |
|
558 | |/ | |
563 | o 1:7c3bad9141dc (public) [ ] add b |
|
559 | o 1:7c3bad9141dc (public) [ ] add b | |
564 | | |
|
560 | | | |
565 | o 0:1f0dee641bb7 (public) [ ] add a |
|
561 | o 0:1f0dee641bb7 (public) [ ] add a | |
566 |
|
562 | |||
567 | $ hg up -q 'desc(n3w_3_c)' |
|
563 | $ hg up -q 'desc(n3w_3_c)' | |
568 | $ mkcommit obsolete_e |
|
564 | $ mkcommit obsolete_e | |
569 | created new head |
|
565 | created new head | |
570 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` |
|
566 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` | |
571 | $ hg outgoing ../tmpf # parasite hg outgoing testin |
|
567 | $ hg outgoing ../tmpf # parasite hg outgoing testin | |
572 | comparing with ../tmpf |
|
568 | comparing with ../tmpf | |
573 | searching for changes |
|
569 | searching for changes | |
574 | 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
|
570 | 6:3de5eca88c00 (draft) [tip ] add obsolete_e | |
575 | $ hg push ../tmpf |
|
571 | $ hg push ../tmpf | |
576 | pushing to ../tmpf |
|
572 | pushing to ../tmpf | |
577 | searching for changes |
|
573 | searching for changes | |
578 | adding changesets |
|
574 | adding changesets | |
579 | adding manifests |
|
575 | adding manifests | |
580 | adding file changes |
|
576 | adding file changes | |
581 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
577 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
582 | 1 new obsolescence markers |
|
578 | 1 new obsolescence markers | |
583 |
|
579 | |||
584 | test relevance computation |
|
580 | test relevance computation | |
585 | --------------------------------------- |
|
581 | --------------------------------------- | |
586 |
|
582 | |||
587 | Checking simple case of "marker relevance". |
|
583 | Checking simple case of "marker relevance". | |
588 |
|
584 | |||
589 |
|
585 | |||
590 | Reminder of the repo situation |
|
586 | Reminder of the repo situation | |
591 |
|
587 | |||
592 | $ hg log --hidden --graph |
|
588 | $ hg log --hidden --graph | |
593 | @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
|
589 | @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e | |
594 | | |
|
590 | | | |
595 | | x 5:cda648ca50f5 (draft) [ ] add original_e |
|
591 | | x 5:cda648ca50f5 (draft) [ ] add original_e | |
596 | | | |
|
592 | | | | |
597 | | x 4:94b33453f93b (draft) [ ] add original_d |
|
593 | | x 4:94b33453f93b (draft) [ ] add original_d | |
598 | |/ |
|
594 | |/ | |
599 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
595 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
600 | | |
|
596 | | | |
601 | | o 2:245bde4270cd (public) [ ] add original_c |
|
597 | | o 2:245bde4270cd (public) [ ] add original_c | |
602 | |/ |
|
598 | |/ | |
603 | o 1:7c3bad9141dc (public) [ ] add b |
|
599 | o 1:7c3bad9141dc (public) [ ] add b | |
604 | | |
|
600 | | | |
605 | o 0:1f0dee641bb7 (public) [ ] add a |
|
601 | o 0:1f0dee641bb7 (public) [ ] add a | |
606 |
|
602 | |||
607 |
|
603 | |||
608 | List of all markers |
|
604 | List of all markers | |
609 |
|
605 | |||
610 | $ hg debugobsolete |
|
606 | $ hg debugobsolete | |
611 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
607 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
612 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
608 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
613 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
609 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
614 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
610 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
615 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
611 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
616 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
612 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
617 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
613 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
618 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) |
|
614 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) | |
619 |
|
615 | |||
620 | List of changesets with no chain |
|
616 | List of changesets with no chain | |
621 |
|
617 | |||
622 | $ hg debugobsolete --hidden --rev ::2 |
|
618 | $ hg debugobsolete --hidden --rev ::2 | |
623 |
|
619 | |||
624 | List of changesets that are included on marker chain |
|
620 | List of changesets that are included on marker chain | |
625 |
|
621 | |||
626 | $ hg debugobsolete --hidden --rev 6 |
|
622 | $ hg debugobsolete --hidden --rev 6 | |
627 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) |
|
623 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) | |
628 |
|
624 | |||
629 | List of changesets with a longer chain, (including a pruned children) |
|
625 | List of changesets with a longer chain, (including a pruned children) | |
630 |
|
626 | |||
631 | $ hg debugobsolete --hidden --rev 3 |
|
627 | $ hg debugobsolete --hidden --rev 3 | |
632 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
628 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
633 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
629 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
634 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
630 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
635 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
631 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
636 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
632 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
637 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
633 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
638 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
634 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
639 |
|
635 | |||
640 | List of both |
|
636 | List of both | |
641 |
|
637 | |||
642 | $ hg debugobsolete --hidden --rev 3::6 |
|
638 | $ hg debugobsolete --hidden --rev 3::6 | |
643 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
639 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
644 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
640 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
645 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
641 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
646 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
642 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
647 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
643 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
648 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
644 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
649 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) |
|
645 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test'} (glob) | |
650 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
646 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
651 |
|
647 | |||
652 | #if serve |
|
648 | #if serve | |
653 |
|
649 | |||
654 | Test the debug output for exchange |
|
650 | Test the debug output for exchange | |
655 | ---------------------------------- |
|
651 | ---------------------------------- | |
656 |
|
652 | |||
657 | $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' --config 'experimental.bundle2-exp=True' |
|
653 | $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' --config 'experimental.bundle2-exp=True' | |
658 | pulling from ../tmpb |
|
654 | pulling from ../tmpb | |
659 | searching for changes |
|
655 | searching for changes | |
660 | no changes found |
|
656 | no changes found | |
661 | obsmarker-exchange: 346 bytes received |
|
657 | obsmarker-exchange: 346 bytes received | |
662 |
|
658 | |||
663 | check hgweb does not explode |
|
659 | check hgweb does not explode | |
664 | ==================================== |
|
660 | ==================================== | |
665 |
|
661 | |||
666 | $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg |
|
662 | $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg | |
667 | adding changesets |
|
663 | adding changesets | |
668 | adding manifests |
|
664 | adding manifests | |
669 | adding file changes |
|
665 | adding file changes | |
670 | added 62 changesets with 63 changes to 9 files (+60 heads) |
|
666 | added 62 changesets with 63 changes to 9 files (+60 heads) | |
671 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
667 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
672 | $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; |
|
668 | $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; | |
673 | > do |
|
669 | > do | |
674 | > hg debugobsolete $node |
|
670 | > hg debugobsolete $node | |
675 | > done |
|
671 | > done | |
676 | $ hg up tip |
|
672 | $ hg up tip | |
677 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
673 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
678 |
|
674 | |||
679 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
675 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
680 | $ cat hg.pid >> $DAEMON_PIDS |
|
676 | $ cat hg.pid >> $DAEMON_PIDS | |
681 |
|
677 | |||
682 | check changelog view |
|
678 | check changelog view | |
683 |
|
679 | |||
684 | $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/' |
|
680 | $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/' | |
685 | 200 Script output follows |
|
681 | 200 Script output follows | |
686 |
|
682 | |||
687 | check graph view |
|
683 | check graph view | |
688 |
|
684 | |||
689 | $ get-with-headers.py --headeronly localhost:$HGPORT 'graph' |
|
685 | $ get-with-headers.py --headeronly localhost:$HGPORT 'graph' | |
690 | 200 Script output follows |
|
686 | 200 Script output follows | |
691 |
|
687 | |||
692 | check filelog view |
|
688 | check filelog view | |
693 |
|
689 | |||
694 | $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' |
|
690 | $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' | |
695 | 200 Script output follows |
|
691 | 200 Script output follows | |
696 |
|
692 | |||
697 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68' |
|
693 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68' | |
698 | 200 Script output follows |
|
694 | 200 Script output follows | |
699 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' |
|
695 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' | |
700 | 404 Not Found |
|
696 | 404 Not Found | |
701 | [1] |
|
697 | [1] | |
702 |
|
698 | |||
703 | check that web.view config option: |
|
699 | check that web.view config option: | |
704 |
|
700 | |||
705 | $ killdaemons.py hg.pid |
|
701 | $ killdaemons.py hg.pid | |
706 | $ cat >> .hg/hgrc << EOF |
|
702 | $ cat >> .hg/hgrc << EOF | |
707 | > [web] |
|
703 | > [web] | |
708 | > view=all |
|
704 | > view=all | |
709 | > EOF |
|
705 | > EOF | |
710 | $ wait |
|
706 | $ wait | |
711 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
707 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
712 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' |
|
708 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' | |
713 | 200 Script output follows |
|
709 | 200 Script output follows | |
714 | $ killdaemons.py hg.pid |
|
710 | $ killdaemons.py hg.pid | |
715 |
|
711 | |||
716 | Checking _enable=False warning if obsolete marker exists |
|
712 | Checking _enable=False warning if obsolete marker exists | |
717 |
|
713 | |||
718 | $ echo '[experimental]' >> $HGRCPATH |
|
714 | $ echo '[experimental]' >> $HGRCPATH | |
719 | $ echo "evolution=" >> $HGRCPATH |
|
715 | $ echo "evolution=" >> $HGRCPATH | |
720 | $ hg log -r tip |
|
716 | $ hg log -r tip | |
721 | obsolete feature not enabled but 68 markers found! |
|
717 | obsolete feature not enabled but 68 markers found! | |
722 | 68:c15e9edfca13 (draft) [tip ] add celestine |
|
718 | 68:c15e9edfca13 (draft) [tip ] add celestine | |
723 |
|
719 | |||
724 | reenable for later test |
|
720 | reenable for later test | |
725 |
|
721 | |||
726 | $ echo '[experimental]' >> $HGRCPATH |
|
722 | $ echo '[experimental]' >> $HGRCPATH | |
727 | $ echo "evolution=createmarkers,exchange" >> $HGRCPATH |
|
723 | $ echo "evolution=createmarkers,exchange" >> $HGRCPATH | |
728 |
|
724 | |||
729 | #endif |
|
725 | #endif | |
730 |
|
726 | |||
731 | Test incoming/outcoming with changesets obsoleted remotely, known locally |
|
727 | Test incoming/outcoming with changesets obsoleted remotely, known locally | |
732 | =============================================================================== |
|
728 | =============================================================================== | |
733 |
|
729 | |||
734 | This test issue 3805 |
|
730 | This test issue 3805 | |
735 |
|
731 | |||
736 | $ hg init repo-issue3805 |
|
732 | $ hg init repo-issue3805 | |
737 | $ cd repo-issue3805 |
|
733 | $ cd repo-issue3805 | |
738 | $ echo "base" > base |
|
734 | $ echo "base" > base | |
739 | $ hg ci -Am "base" |
|
735 | $ hg ci -Am "base" | |
740 | adding base |
|
736 | adding base | |
741 | $ echo "foo" > foo |
|
737 | $ echo "foo" > foo | |
742 | $ hg ci -Am "A" |
|
738 | $ hg ci -Am "A" | |
743 | adding foo |
|
739 | adding foo | |
744 | $ hg clone . ../other-issue3805 |
|
740 | $ hg clone . ../other-issue3805 | |
745 | updating to branch default |
|
741 | updating to branch default | |
746 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
742 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
747 | $ echo "bar" >> foo |
|
743 | $ echo "bar" >> foo | |
748 | $ hg ci --amend |
|
744 | $ hg ci --amend | |
749 | $ cd ../other-issue3805 |
|
745 | $ cd ../other-issue3805 | |
750 | $ hg log -G |
|
746 | $ hg log -G | |
751 | @ 1:29f0c6921ddd (draft) [tip ] A |
|
747 | @ 1:29f0c6921ddd (draft) [tip ] A | |
752 | | |
|
748 | | | |
753 | o 0:d20a80d4def3 (draft) [ ] base |
|
749 | o 0:d20a80d4def3 (draft) [ ] base | |
754 |
|
750 | |||
755 | $ hg log -G -R ../repo-issue3805 |
|
751 | $ hg log -G -R ../repo-issue3805 | |
756 | @ 3:323a9c3ddd91 (draft) [tip ] A |
|
752 | @ 3:323a9c3ddd91 (draft) [tip ] A | |
757 | | |
|
753 | | | |
758 | o 0:d20a80d4def3 (draft) [ ] base |
|
754 | o 0:d20a80d4def3 (draft) [ ] base | |
759 |
|
755 | |||
760 | $ hg incoming |
|
756 | $ hg incoming | |
761 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
757 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
762 | searching for changes |
|
758 | searching for changes | |
763 | 3:323a9c3ddd91 (draft) [tip ] A |
|
759 | 3:323a9c3ddd91 (draft) [tip ] A | |
764 | $ hg incoming --bundle ../issue3805.hg |
|
760 | $ hg incoming --bundle ../issue3805.hg | |
765 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
761 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
766 | searching for changes |
|
762 | searching for changes | |
767 | 3:323a9c3ddd91 (draft) [tip ] A |
|
763 | 3:323a9c3ddd91 (draft) [tip ] A | |
768 | $ hg outgoing |
|
764 | $ hg outgoing | |
769 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
765 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
770 | searching for changes |
|
766 | searching for changes | |
771 | 1:29f0c6921ddd (draft) [tip ] A |
|
767 | 1:29f0c6921ddd (draft) [tip ] A | |
772 |
|
768 | |||
773 | #if serve |
|
769 | #if serve | |
774 |
|
770 | |||
775 | $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
771 | $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
776 | $ cat hg.pid >> $DAEMON_PIDS |
|
772 | $ cat hg.pid >> $DAEMON_PIDS | |
777 |
|
773 | |||
778 | $ hg incoming http://localhost:$HGPORT |
|
774 | $ hg incoming http://localhost:$HGPORT | |
779 | comparing with http://localhost:$HGPORT/ |
|
775 | comparing with http://localhost:$HGPORT/ | |
780 | searching for changes |
|
776 | searching for changes | |
781 | 2:323a9c3ddd91 (draft) [tip ] A |
|
777 | 2:323a9c3ddd91 (draft) [tip ] A | |
782 | $ hg outgoing http://localhost:$HGPORT |
|
778 | $ hg outgoing http://localhost:$HGPORT | |
783 | comparing with http://localhost:$HGPORT/ |
|
779 | comparing with http://localhost:$HGPORT/ | |
784 | searching for changes |
|
780 | searching for changes | |
785 | 1:29f0c6921ddd (draft) [tip ] A |
|
781 | 1:29f0c6921ddd (draft) [tip ] A | |
786 |
|
782 | |||
787 | $ killdaemons.py |
|
783 | $ killdaemons.py | |
788 |
|
784 | |||
789 | #endif |
|
785 | #endif | |
790 |
|
786 | |||
791 | This test issue 3814 |
|
787 | This test issue 3814 | |
792 |
|
788 | |||
793 | (nothing to push but locally hidden changeset) |
|
789 | (nothing to push but locally hidden changeset) | |
794 |
|
790 | |||
795 | $ cd .. |
|
791 | $ cd .. | |
796 | $ hg init repo-issue3814 |
|
792 | $ hg init repo-issue3814 | |
797 | $ cd repo-issue3805 |
|
793 | $ cd repo-issue3805 | |
798 | $ hg push -r 323a9c3ddd91 ../repo-issue3814 |
|
794 | $ hg push -r 323a9c3ddd91 ../repo-issue3814 | |
799 | pushing to ../repo-issue3814 |
|
795 | pushing to ../repo-issue3814 | |
800 | searching for changes |
|
796 | searching for changes | |
801 | adding changesets |
|
797 | adding changesets | |
802 | adding manifests |
|
798 | adding manifests | |
803 | adding file changes |
|
799 | adding file changes | |
804 | added 2 changesets with 2 changes to 2 files |
|
800 | added 2 changesets with 2 changes to 2 files | |
805 | 2 new obsolescence markers |
|
801 | 2 new obsolescence markers | |
806 | $ hg out ../repo-issue3814 |
|
802 | $ hg out ../repo-issue3814 | |
807 | comparing with ../repo-issue3814 |
|
803 | comparing with ../repo-issue3814 | |
808 | searching for changes |
|
804 | searching for changes | |
809 | no changes found |
|
805 | no changes found | |
810 | [1] |
|
806 | [1] | |
811 |
|
807 | |||
812 | Test that a local tag blocks a changeset from being hidden |
|
808 | Test that a local tag blocks a changeset from being hidden | |
813 |
|
809 | |||
814 | $ hg tag -l visible -r 1 --hidden |
|
810 | $ hg tag -l visible -r 1 --hidden | |
815 | $ hg log -G |
|
811 | $ hg log -G | |
816 | @ 3:323a9c3ddd91 (draft) [tip ] A |
|
812 | @ 3:323a9c3ddd91 (draft) [tip ] A | |
817 | | |
|
813 | | | |
818 | | x 1:29f0c6921ddd (draft) [visible ] A |
|
814 | | x 1:29f0c6921ddd (draft) [visible ] A | |
819 | |/ |
|
815 | |/ | |
820 | o 0:d20a80d4def3 (draft) [ ] base |
|
816 | o 0:d20a80d4def3 (draft) [ ] base | |
821 |
|
817 | |||
822 | Test that removing a local tag does not cause some commands to fail |
|
818 | Test that removing a local tag does not cause some commands to fail | |
823 |
|
819 | |||
824 | $ hg tag -l -r tip tiptag |
|
820 | $ hg tag -l -r tip tiptag | |
825 | $ hg tags |
|
821 | $ hg tags | |
826 | tiptag 3:323a9c3ddd91 |
|
822 | tiptag 3:323a9c3ddd91 | |
827 | tip 3:323a9c3ddd91 |
|
823 | tip 3:323a9c3ddd91 | |
828 | visible 1:29f0c6921ddd |
|
824 | visible 1:29f0c6921ddd | |
829 | $ hg --config extensions.strip= strip -r tip --no-backup |
|
825 | $ hg --config extensions.strip= strip -r tip --no-backup | |
830 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
826 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
831 | $ hg tags |
|
827 | $ hg tags | |
832 | visible 1:29f0c6921ddd |
|
828 | visible 1:29f0c6921ddd | |
833 | tip 1:29f0c6921ddd |
|
829 | tip 1:29f0c6921ddd | |
834 |
|
830 | |||
835 | Test bundle overlay onto hidden revision |
|
831 | Test bundle overlay onto hidden revision | |
836 |
|
832 | |||
837 | $ cd .. |
|
833 | $ cd .. | |
838 | $ hg init repo-bundleoverlay |
|
834 | $ hg init repo-bundleoverlay | |
839 | $ cd repo-bundleoverlay |
|
835 | $ cd repo-bundleoverlay | |
840 | $ echo "A" > foo |
|
836 | $ echo "A" > foo | |
841 | $ hg ci -Am "A" |
|
837 | $ hg ci -Am "A" | |
842 | adding foo |
|
838 | adding foo | |
843 | $ echo "B" >> foo |
|
839 | $ echo "B" >> foo | |
844 | $ hg ci -m "B" |
|
840 | $ hg ci -m "B" | |
845 | $ hg up 0 |
|
841 | $ hg up 0 | |
846 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
842 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
847 | $ echo "C" >> foo |
|
843 | $ echo "C" >> foo | |
848 | $ hg ci -m "C" |
|
844 | $ hg ci -m "C" | |
849 | created new head |
|
845 | created new head | |
850 | $ hg log -G |
|
846 | $ hg log -G | |
851 | @ 2:c186d7714947 (draft) [tip ] C |
|
847 | @ 2:c186d7714947 (draft) [tip ] C | |
852 | | |
|
848 | | | |
853 | | o 1:44526ebb0f98 (draft) [ ] B |
|
849 | | o 1:44526ebb0f98 (draft) [ ] B | |
854 | |/ |
|
850 | |/ | |
855 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
851 | o 0:4b34ecfb0d56 (draft) [ ] A | |
856 |
|
852 | |||
857 |
|
853 | |||
858 | $ hg clone -r1 . ../other-bundleoverlay |
|
854 | $ hg clone -r1 . ../other-bundleoverlay | |
859 | adding changesets |
|
855 | adding changesets | |
860 | adding manifests |
|
856 | adding manifests | |
861 | adding file changes |
|
857 | adding file changes | |
862 | added 2 changesets with 2 changes to 1 files |
|
858 | added 2 changesets with 2 changes to 1 files | |
863 | updating to branch default |
|
859 | updating to branch default | |
864 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
860 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
865 | $ cd ../other-bundleoverlay |
|
861 | $ cd ../other-bundleoverlay | |
866 | $ echo "B+" >> foo |
|
862 | $ echo "B+" >> foo | |
867 | $ hg ci --amend -m "B+" |
|
863 | $ hg ci --amend -m "B+" | |
868 | $ hg log -G --hidden |
|
864 | $ hg log -G --hidden | |
869 | @ 3:b7d587542d40 (draft) [tip ] B+ |
|
865 | @ 3:b7d587542d40 (draft) [tip ] B+ | |
870 | | |
|
866 | | | |
871 | | x 2:eb95e9297e18 (draft) [ ] temporary amend commit for 44526ebb0f98 |
|
867 | | x 2:eb95e9297e18 (draft) [ ] temporary amend commit for 44526ebb0f98 | |
872 | | | |
|
868 | | | | |
873 | | x 1:44526ebb0f98 (draft) [ ] B |
|
869 | | x 1:44526ebb0f98 (draft) [ ] B | |
874 | |/ |
|
870 | |/ | |
875 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
871 | o 0:4b34ecfb0d56 (draft) [ ] A | |
876 |
|
872 | |||
877 |
|
873 | |||
878 | $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg |
|
874 | $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg | |
879 | comparing with ../repo-bundleoverlay |
|
875 | comparing with ../repo-bundleoverlay | |
880 | searching for changes |
|
876 | searching for changes | |
881 | 1:44526ebb0f98 (draft) [ ] B |
|
877 | 1:44526ebb0f98 (draft) [ ] B | |
882 | 2:c186d7714947 (draft) [tip ] C |
|
878 | 2:c186d7714947 (draft) [tip ] C | |
883 | $ hg log -G -R ../bundleoverlay.hg |
|
879 | $ hg log -G -R ../bundleoverlay.hg | |
884 | o 4:c186d7714947 (draft) [tip ] C |
|
880 | o 4:c186d7714947 (draft) [tip ] C | |
885 | | |
|
881 | | | |
886 | | @ 3:b7d587542d40 (draft) [ ] B+ |
|
882 | | @ 3:b7d587542d40 (draft) [ ] B+ | |
887 | |/ |
|
883 | |/ | |
888 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
884 | o 0:4b34ecfb0d56 (draft) [ ] A | |
889 |
|
885 | |||
890 |
|
886 | |||
891 | #if serve |
|
887 | #if serve | |
892 |
|
888 | |||
893 | Test issue 4506 |
|
889 | Test issue 4506 | |
894 |
|
890 | |||
895 | $ cd .. |
|
891 | $ cd .. | |
896 | $ hg init repo-issue4506 |
|
892 | $ hg init repo-issue4506 | |
897 | $ cd repo-issue4506 |
|
893 | $ cd repo-issue4506 | |
898 | $ echo "0" > foo |
|
894 | $ echo "0" > foo | |
899 | $ hg add foo |
|
895 | $ hg add foo | |
900 | $ hg ci -m "content-0" |
|
896 | $ hg ci -m "content-0" | |
901 |
|
897 | |||
902 | $ hg up null |
|
898 | $ hg up null | |
903 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
899 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
904 | $ echo "1" > bar |
|
900 | $ echo "1" > bar | |
905 | $ hg add bar |
|
901 | $ hg add bar | |
906 | $ hg ci -m "content-1" |
|
902 | $ hg ci -m "content-1" | |
907 | created new head |
|
903 | created new head | |
908 | $ hg up 0 |
|
904 | $ hg up 0 | |
909 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
905 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
910 | $ hg graft 1 |
|
906 | $ hg graft 1 | |
911 | grafting 1:1c9eddb02162 "content-1" (tip) |
|
907 | grafting 1:1c9eddb02162 "content-1" (tip) | |
912 |
|
908 | |||
913 | $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` |
|
909 | $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` | |
914 |
|
910 | |||
915 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
911 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
916 | $ cat hg.pid >> $DAEMON_PIDS |
|
912 | $ cat hg.pid >> $DAEMON_PIDS | |
917 |
|
913 | |||
918 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1' |
|
914 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1' | |
919 | 404 Not Found |
|
915 | 404 Not Found | |
920 | [1] |
|
916 | [1] | |
921 | $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar' |
|
917 | $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar' | |
922 | 200 Script output follows |
|
918 | 200 Script output follows | |
923 | $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar' |
|
919 | $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar' | |
924 | 200 Script output follows |
|
920 | 200 Script output follows | |
925 |
|
921 | |||
926 | $ killdaemons.py |
|
922 | $ killdaemons.py | |
927 |
|
923 | |||
928 | #endif |
|
924 | #endif | |
929 |
|
925 | |||
930 | Test heads computation on pending index changes with obsolescence markers |
|
926 | Test heads computation on pending index changes with obsolescence markers | |
931 | $ cd .. |
|
927 | $ cd .. | |
932 | $ cat >$TESTTMP/test_extension.py << EOF |
|
928 | $ cat >$TESTTMP/test_extension.py << EOF | |
933 | > from mercurial import cmdutil |
|
929 | > from mercurial import cmdutil | |
934 | > from mercurial.i18n import _ |
|
930 | > from mercurial.i18n import _ | |
935 | > |
|
931 | > | |
936 | > cmdtable = {} |
|
932 | > cmdtable = {} | |
937 | > command = cmdutil.command(cmdtable) |
|
933 | > command = cmdutil.command(cmdtable) | |
938 | > @command("amendtransient",[], _('hg amendtransient [rev]')) |
|
934 | > @command("amendtransient",[], _('hg amendtransient [rev]')) | |
939 | > def amend(ui, repo, *pats, **opts): |
|
935 | > def amend(ui, repo, *pats, **opts): | |
940 | > def commitfunc(ui, repo, message, match, opts): |
|
936 | > def commitfunc(ui, repo, message, match, opts): | |
941 | > return repo.commit(message, repo['.'].user(), repo['.'].date(), match) |
|
937 | > return repo.commit(message, repo['.'].user(), repo['.'].date(), match) | |
942 | > opts['message'] = 'Test' |
|
938 | > opts['message'] = 'Test' | |
943 | > opts['logfile'] = None |
|
939 | > opts['logfile'] = None | |
944 | > cmdutil.amend(ui, repo, commitfunc, repo['.'], {}, pats, opts) |
|
940 | > cmdutil.amend(ui, repo, commitfunc, repo['.'], {}, pats, opts) | |
945 | > ui.write('%s\n' % repo.changelog.headrevs()) |
|
941 | > ui.write('%s\n' % repo.changelog.headrevs()) | |
946 | > EOF |
|
942 | > EOF | |
947 | $ cat >> $HGRCPATH << EOF |
|
943 | $ cat >> $HGRCPATH << EOF | |
948 | > [extensions] |
|
944 | > [extensions] | |
949 | > testextension=$TESTTMP/test_extension.py |
|
945 | > testextension=$TESTTMP/test_extension.py | |
950 | > EOF |
|
946 | > EOF | |
951 | $ hg init repo-issue-nativerevs-pending-changes |
|
947 | $ hg init repo-issue-nativerevs-pending-changes | |
952 | $ cd repo-issue-nativerevs-pending-changes |
|
948 | $ cd repo-issue-nativerevs-pending-changes | |
953 | $ mkcommit a |
|
949 | $ mkcommit a | |
954 | $ mkcommit b |
|
950 | $ mkcommit b | |
955 | $ hg up ".^" |
|
951 | $ hg up ".^" | |
956 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
952 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
957 | $ echo aa > a |
|
953 | $ echo aa > a | |
958 | $ hg amendtransient |
|
954 | $ hg amendtransient | |
959 | [1, 3] |
|
955 | [1, 3] | |
960 |
|
956 | |||
961 | Check that corrupted hidden cache does not crash |
|
957 | Check that corrupted hidden cache does not crash | |
962 |
|
958 | |||
963 | $ printf "" > .hg/cache/hidden |
|
959 | $ printf "" > .hg/cache/hidden | |
964 | $ hg log -r . -T '{node}' --debug |
|
960 | $ hg log -r . -T '{node}' --debug | |
965 | corrupted hidden cache |
|
961 | corrupted hidden cache | |
966 | 8fd96dfc63e51ed5a8af1bec18eb4b19dbf83812 (no-eol) |
|
962 | 8fd96dfc63e51ed5a8af1bec18eb4b19dbf83812 (no-eol) | |
967 | $ hg log -r . -T '{node}' --debug |
|
963 | $ hg log -r . -T '{node}' --debug | |
968 | 8fd96dfc63e51ed5a8af1bec18eb4b19dbf83812 (no-eol) |
|
964 | 8fd96dfc63e51ed5a8af1bec18eb4b19dbf83812 (no-eol) | |
969 |
|
965 | |||
970 | #if unix-permissions |
|
966 | #if unix-permissions | |
971 | Check that wrong hidden cache permission does not crash |
|
967 | Check that wrong hidden cache permission does not crash | |
972 |
|
968 | |||
973 | $ chmod 000 .hg/cache/hidden |
|
969 | $ chmod 000 .hg/cache/hidden | |
974 | $ hg log -r . -T '{node}' --debug |
|
970 | $ hg log -r . -T '{node}' --debug | |
975 | cannot read hidden cache |
|
971 | cannot read hidden cache | |
976 | error writing hidden changesets cache |
|
972 | error writing hidden changesets cache | |
977 | 8fd96dfc63e51ed5a8af1bec18eb4b19dbf83812 (no-eol) |
|
973 | 8fd96dfc63e51ed5a8af1bec18eb4b19dbf83812 (no-eol) | |
978 | #endif |
|
974 | #endif | |
979 |
|
975 | |||
980 | Test cache consistency for the visible filter |
|
976 | Test cache consistency for the visible filter | |
981 | 1) We want to make sure that the cached filtered revs are invalidated when |
|
977 | 1) We want to make sure that the cached filtered revs are invalidated when | |
982 | bookmarks change |
|
978 | bookmarks change | |
983 | $ cd .. |
|
979 | $ cd .. | |
984 | $ cat >$TESTTMP/test_extension.py << EOF |
|
980 | $ cat >$TESTTMP/test_extension.py << EOF | |
985 | > import weakref |
|
981 | > import weakref | |
986 | > from mercurial import cmdutil, extensions, bookmarks, repoview |
|
982 | > from mercurial import cmdutil, extensions, bookmarks, repoview | |
987 | > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs): |
|
983 | > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs): | |
988 | > reporef = weakref.ref(bkmstoreinst._repo) |
|
984 | > reporef = weakref.ref(bkmstoreinst._repo) | |
989 | > def trhook(tr): |
|
985 | > def trhook(tr): | |
990 | > repo = reporef() |
|
986 | > repo = reporef() | |
991 | > hidden1 = repoview.computehidden(repo) |
|
987 | > hidden1 = repoview.computehidden(repo) | |
992 | > hidden = repoview.filterrevs(repo, 'visible') |
|
988 | > hidden = repoview.filterrevs(repo, 'visible') | |
993 | > if sorted(hidden1) != sorted(hidden): |
|
989 | > if sorted(hidden1) != sorted(hidden): | |
994 | > print "cache inconsistency" |
|
990 | > print "cache inconsistency" | |
995 | > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook) |
|
991 | > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook) | |
996 | > orig(bkmstoreinst, *args, **kwargs) |
|
992 | > orig(bkmstoreinst, *args, **kwargs) | |
997 | > def extsetup(ui): |
|
993 | > def extsetup(ui): | |
998 | > extensions.wrapfunction(bookmarks.bmstore, 'recordchange', |
|
994 | > extensions.wrapfunction(bookmarks.bmstore, 'recordchange', | |
999 | > _bookmarkchanged) |
|
995 | > _bookmarkchanged) | |
1000 | > EOF |
|
996 | > EOF | |
1001 |
|
997 | |||
1002 | $ hg init repo-cache-inconsistency |
|
998 | $ hg init repo-cache-inconsistency | |
1003 | $ cd repo-issue-nativerevs-pending-changes |
|
999 | $ cd repo-issue-nativerevs-pending-changes | |
1004 | $ mkcommit a |
|
1000 | $ mkcommit a | |
1005 | a already tracked! |
|
1001 | a already tracked! | |
1006 | $ mkcommit b |
|
1002 | $ mkcommit b | |
1007 | $ hg id |
|
1003 | $ hg id | |
1008 | 13bedc178fce tip |
|
1004 | 13bedc178fce tip | |
1009 | $ echo "hello" > b |
|
1005 | $ echo "hello" > b | |
1010 | $ hg commit --amend -m "message" |
|
1006 | $ hg commit --amend -m "message" | |
1011 | $ hg book bookb -r 13bedc178fce --hidden |
|
1007 | $ hg book bookb -r 13bedc178fce --hidden | |
1012 | $ hg log -r 13bedc178fce |
|
1008 | $ hg log -r 13bedc178fce | |
1013 | 5:13bedc178fce (draft) [ bookb] add b |
|
1009 | 5:13bedc178fce (draft) [ bookb] add b | |
1014 | $ hg book -d bookb |
|
1010 | $ hg book -d bookb | |
1015 | $ hg log -r 13bedc178fce |
|
1011 | $ hg log -r 13bedc178fce | |
1016 | abort: hidden revision '13bedc178fce'! |
|
1012 | abort: hidden revision '13bedc178fce'! | |
1017 | (use --hidden to access hidden revisions) |
|
1013 | (use --hidden to access hidden revisions) | |
1018 | [255] |
|
1014 | [255] | |
1019 |
|
1015 | |||
1020 | Empty out the test extension, as it isn't compatible with later parts |
|
1016 | Empty out the test extension, as it isn't compatible with later parts | |
1021 | of the test. |
|
1017 | of the test. | |
1022 | $ echo > $TESTTMP/test_extension.py |
|
1018 | $ echo > $TESTTMP/test_extension.py | |
1023 |
|
1019 | |||
1024 | Test ability to pull changeset with locally applying obsolescence markers |
|
1020 | Test ability to pull changeset with locally applying obsolescence markers | |
1025 | (issue4945) |
|
1021 | (issue4945) | |
1026 |
|
1022 | |||
1027 | $ cd .. |
|
1023 | $ cd .. | |
1028 | $ hg init issue4845 |
|
1024 | $ hg init issue4845 | |
1029 | $ cd issue4845 |
|
1025 | $ cd issue4845 | |
1030 |
|
1026 | |||
1031 | $ echo foo > f0 |
|
1027 | $ echo foo > f0 | |
1032 | $ hg add f0 |
|
1028 | $ hg add f0 | |
1033 | $ hg ci -m '0' |
|
1029 | $ hg ci -m '0' | |
1034 | $ echo foo > f1 |
|
1030 | $ echo foo > f1 | |
1035 | $ hg add f1 |
|
1031 | $ hg add f1 | |
1036 | $ hg ci -m '1' |
|
1032 | $ hg ci -m '1' | |
1037 | $ echo foo > f2 |
|
1033 | $ echo foo > f2 | |
1038 | $ hg add f2 |
|
1034 | $ hg add f2 | |
1039 | $ hg ci -m '2' |
|
1035 | $ hg ci -m '2' | |
1040 |
|
1036 | |||
1041 | $ echo bar > f2 |
|
1037 | $ echo bar > f2 | |
1042 | $ hg commit --amend --config experimetnal.evolution=createmarkers |
|
1038 | $ hg commit --amend --config experimetnal.evolution=createmarkers | |
1043 | $ hg log -G |
|
1039 | $ hg log -G | |
1044 | @ 4:b0551702f918 (draft) [tip ] 2 |
|
1040 | @ 4:b0551702f918 (draft) [tip ] 2 | |
1045 | | |
|
1041 | | | |
1046 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1042 | o 1:e016b03fd86f (draft) [ ] 1 | |
1047 | | |
|
1043 | | | |
1048 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1044 | o 0:a78f55e5508c (draft) [ ] 0 | |
1049 |
|
1045 | |||
1050 | $ hg log -G --hidden |
|
1046 | $ hg log -G --hidden | |
1051 | @ 4:b0551702f918 (draft) [tip ] 2 |
|
1047 | @ 4:b0551702f918 (draft) [tip ] 2 | |
1052 | | |
|
1048 | | | |
1053 | | x 3:f27abbcc1f77 (draft) [ ] temporary amend commit for e008cf283490 |
|
1049 | | x 3:f27abbcc1f77 (draft) [ ] temporary amend commit for e008cf283490 | |
1054 | | | |
|
1050 | | | | |
1055 | | x 2:e008cf283490 (draft) [ ] 2 |
|
1051 | | x 2:e008cf283490 (draft) [ ] 2 | |
1056 | |/ |
|
1052 | |/ | |
1057 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1053 | o 1:e016b03fd86f (draft) [ ] 1 | |
1058 | | |
|
1054 | | | |
1059 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1055 | o 0:a78f55e5508c (draft) [ ] 0 | |
1060 |
|
1056 | |||
1061 |
|
1057 | |||
1062 | $ hg strip -r 1 --config extensions.strip= |
|
1058 | $ hg strip -r 1 --config extensions.strip= | |
1063 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1059 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1064 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-c41c6bcc-backup.hg (glob) |
|
1060 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-c41c6bcc-backup.hg (glob) | |
1065 | $ hg log -G |
|
1061 | $ hg log -G | |
1066 | @ 0:a78f55e5508c (draft) [tip ] 0 |
|
1062 | @ 0:a78f55e5508c (draft) [tip ] 0 | |
1067 |
|
1063 | |||
1068 | $ hg log -G --hidden |
|
1064 | $ hg log -G --hidden | |
1069 | @ 0:a78f55e5508c (draft) [tip ] 0 |
|
1065 | @ 0:a78f55e5508c (draft) [tip ] 0 | |
1070 |
|
1066 | |||
1071 |
|
1067 | |||
1072 | $ hg pull .hg/strip-backup/* |
|
1068 | $ hg pull .hg/strip-backup/* | |
1073 | pulling from .hg/strip-backup/e016b03fd86f-c41c6bcc-backup.hg |
|
1069 | pulling from .hg/strip-backup/e016b03fd86f-c41c6bcc-backup.hg | |
1074 | searching for changes |
|
1070 | searching for changes | |
1075 | adding changesets |
|
1071 | adding changesets | |
1076 | adding manifests |
|
1072 | adding manifests | |
1077 | adding file changes |
|
1073 | adding file changes | |
1078 | added 2 changesets with 2 changes to 2 files |
|
1074 | added 2 changesets with 2 changes to 2 files | |
1079 | (run 'hg update' to get a working copy) |
|
1075 | (run 'hg update' to get a working copy) | |
1080 | $ hg log -G |
|
1076 | $ hg log -G | |
1081 | o 2:b0551702f918 (draft) [tip ] 2 |
|
1077 | o 2:b0551702f918 (draft) [tip ] 2 | |
1082 | | |
|
1078 | | | |
1083 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1079 | o 1:e016b03fd86f (draft) [ ] 1 | |
1084 | | |
|
1080 | | | |
1085 | @ 0:a78f55e5508c (draft) [ ] 0 |
|
1081 | @ 0:a78f55e5508c (draft) [ ] 0 | |
1086 |
|
1082 | |||
1087 | $ hg log -G --hidden |
|
1083 | $ hg log -G --hidden | |
1088 | o 2:b0551702f918 (draft) [tip ] 2 |
|
1084 | o 2:b0551702f918 (draft) [tip ] 2 | |
1089 | | |
|
1085 | | | |
1090 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1086 | o 1:e016b03fd86f (draft) [ ] 1 | |
1091 | | |
|
1087 | | | |
1092 | @ 0:a78f55e5508c (draft) [ ] 0 |
|
1088 | @ 0:a78f55e5508c (draft) [ ] 0 | |
1093 |
|
1089 | |||
1094 | Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when |
|
1090 | Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when | |
1095 | only a subset of those are displayed (because of --rev option) |
|
1091 | only a subset of those are displayed (because of --rev option) | |
1096 | $ hg init doindexrev |
|
1092 | $ hg init doindexrev | |
1097 | $ cd doindexrev |
|
1093 | $ cd doindexrev | |
1098 | $ echo a > a |
|
1094 | $ echo a > a | |
1099 | $ hg ci -Am a |
|
1095 | $ hg ci -Am a | |
1100 | adding a |
|
1096 | adding a | |
1101 | $ hg ci --amend -m aa |
|
1097 | $ hg ci --amend -m aa | |
1102 | $ echo b > b |
|
1098 | $ echo b > b | |
1103 | $ hg ci -Am b |
|
1099 | $ hg ci -Am b | |
1104 | adding b |
|
1100 | adding b | |
1105 | $ hg ci --amend -m bb |
|
1101 | $ hg ci --amend -m bb | |
1106 | $ echo c > c |
|
1102 | $ echo c > c | |
1107 | $ hg ci -Am c |
|
1103 | $ hg ci -Am c | |
1108 | adding c |
|
1104 | adding c | |
1109 | $ hg ci --amend -m cc |
|
1105 | $ hg ci --amend -m cc | |
1110 | $ echo d > d |
|
1106 | $ echo d > d | |
1111 | $ hg ci -Am d |
|
1107 | $ hg ci -Am d | |
1112 | adding d |
|
1108 | adding d | |
1113 | $ hg ci --amend -m dd |
|
1109 | $ hg ci --amend -m dd | |
1114 | $ hg debugobsolete --index --rev "3+7" |
|
1110 | $ hg debugobsolete --index --rev "3+7" | |
1115 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) |
|
1111 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) | |
1116 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'user': 'test'} (re) |
|
1112 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'user': 'test'} (re) | |
1117 |
|
1113 | |||
1118 | Test the --delete option of debugobsolete command |
|
1114 | Test the --delete option of debugobsolete command | |
1119 | $ hg debugobsolete --index |
|
1115 | $ hg debugobsolete --index | |
1120 | 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re) |
|
1116 | 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re) | |
1121 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) |
|
1117 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) | |
1122 | 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) |
|
1118 | 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) | |
1123 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'user': 'test'} (re) |
|
1119 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'user': 'test'} (re) | |
1124 | $ hg debugobsolete --delete 1 --delete 3 |
|
1120 | $ hg debugobsolete --delete 1 --delete 3 | |
1125 | deleted 2 obsolescense markers |
|
1121 | deleted 2 obsolescense markers | |
1126 | $ hg debugobsolete |
|
1122 | $ hg debugobsolete | |
1127 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re) |
|
1123 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 \(.*\) {'user': 'test'} (re) | |
1128 | 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) |
|
1124 | 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 \(.*\) {'user': 'test'} (re) | |
1129 | $ cd .. |
|
1125 | $ cd .. | |
1130 |
|
1126 |
General Comments 0
You need to be logged in to leave comments.
Login now