Show More
@@ -1,383 +1,383 b'' | |||||
1 | $ "$TESTDIR/hghave" serve || exit 80 |
|
1 | $ "$TESTDIR/hghave" serve || exit 80 | |
2 |
|
2 | |||
3 | $ cat << EOF >> $HGRCPATH |
|
3 | $ cat << EOF >> $HGRCPATH | |
4 | > [ui] |
|
4 | > [ui] | |
5 | > logtemplate={rev}:{node|short} {desc|firstline} |
|
5 | > logtemplate={rev}:{node|short} {desc|firstline} | |
6 | > [phases] |
|
6 | > [phases] | |
7 | > publish=False |
|
7 | > publish=False | |
8 | > [extensions] |
|
8 | > [extensions] | |
9 | > EOF |
|
9 | > EOF | |
10 | $ cat > obs.py << EOF |
|
10 | $ cat > obs.py << EOF | |
11 | > import mercurial.obsolete |
|
11 | > import mercurial.obsolete | |
12 | > mercurial.obsolete._enabled = True |
|
12 | > mercurial.obsolete._enabled = True | |
13 | > EOF |
|
13 | > EOF | |
14 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH |
|
14 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH | |
15 |
|
15 | |||
16 | initialize |
|
16 | initialize | |
17 |
|
17 | |||
18 | $ hg init a |
|
18 | $ hg init a | |
19 | $ cd a |
|
19 | $ cd a | |
20 | $ echo 'test' > test |
|
20 | $ echo 'test' > test | |
21 | $ hg commit -Am'test' |
|
21 | $ hg commit -Am'test' | |
22 | adding test |
|
22 | adding test | |
23 |
|
23 | |||
24 | set bookmarks |
|
24 | set bookmarks | |
25 |
|
25 | |||
26 | $ hg bookmark X |
|
26 | $ hg bookmark X | |
27 | $ hg bookmark Y |
|
27 | $ hg bookmark Y | |
28 | $ hg bookmark Z |
|
28 | $ hg bookmark Z | |
29 |
|
29 | |||
30 | import bookmark by name |
|
30 | import bookmark by name | |
31 |
|
31 | |||
32 | $ hg init ../b |
|
32 | $ hg init ../b | |
33 | $ cd ../b |
|
33 | $ cd ../b | |
34 | $ hg book Y |
|
34 | $ hg book Y | |
35 | $ hg book |
|
35 | $ hg book | |
36 | * Y -1:000000000000 |
|
36 | * Y -1:000000000000 | |
37 | $ hg pull ../a |
|
37 | $ hg pull ../a | |
38 | pulling from ../a |
|
38 | pulling from ../a | |
39 | requesting all changes |
|
39 | requesting all changes | |
40 | adding changesets |
|
40 | adding changesets | |
41 | adding manifests |
|
41 | adding manifests | |
42 | adding file changes |
|
42 | adding file changes | |
43 | added 1 changesets with 1 changes to 1 files |
|
43 | added 1 changesets with 1 changes to 1 files | |
44 | adding remote bookmark X |
|
44 | adding remote bookmark X | |
45 | updating bookmark Y |
|
45 | updating bookmark Y | |
46 | adding remote bookmark Z |
|
46 | adding remote bookmark Z | |
47 | (run 'hg update' to get a working copy) |
|
47 | (run 'hg update' to get a working copy) | |
48 | $ hg bookmarks |
|
48 | $ hg bookmarks | |
49 | X 0:4e3505fd9583 |
|
49 | X 0:4e3505fd9583 | |
50 | Y 0:4e3505fd9583 |
|
50 | Y 0:4e3505fd9583 | |
51 | Z 0:4e3505fd9583 |
|
51 | Z 0:4e3505fd9583 | |
52 | $ hg debugpushkey ../a namespaces |
|
52 | $ hg debugpushkey ../a namespaces | |
53 | bookmarks |
|
53 | bookmarks | |
54 | namespaces |
|
54 | namespaces | |
55 | obsolete |
|
55 | obsolete | |
56 | phases |
|
56 | phases | |
57 | $ hg debugpushkey ../a bookmarks |
|
57 | $ hg debugpushkey ../a bookmarks | |
58 | X 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
58 | X 4e3505fd95835d721066b76e75dbb8cc554d7f77 | |
59 | Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
59 | Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 | |
60 | Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
60 | Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 | |
61 | $ hg pull -B X ../a |
|
61 | $ hg pull -B X ../a | |
62 | pulling from ../a |
|
62 | pulling from ../a | |
63 | no changes found |
|
63 | no changes found | |
64 | importing bookmark X |
|
64 | importing bookmark X | |
65 | $ hg bookmark |
|
65 | $ hg bookmark | |
66 | X 0:4e3505fd9583 |
|
66 | X 0:4e3505fd9583 | |
67 | Y 0:4e3505fd9583 |
|
67 | Y 0:4e3505fd9583 | |
68 | Z 0:4e3505fd9583 |
|
68 | Z 0:4e3505fd9583 | |
69 |
|
69 | |||
70 | export bookmark by name |
|
70 | export bookmark by name | |
71 |
|
71 | |||
72 | $ hg bookmark W |
|
72 | $ hg bookmark W | |
73 | $ hg bookmark foo |
|
73 | $ hg bookmark foo | |
74 | $ hg bookmark foobar |
|
74 | $ hg bookmark foobar | |
75 | $ hg push -B W ../a |
|
75 | $ hg push -B W ../a | |
76 | pushing to ../a |
|
76 | pushing to ../a | |
77 | searching for changes |
|
77 | searching for changes | |
78 | no changes found |
|
78 | no changes found | |
79 | exporting bookmark W |
|
79 | exporting bookmark W | |
80 | [1] |
|
80 | [1] | |
81 | $ hg -R ../a bookmarks |
|
81 | $ hg -R ../a bookmarks | |
82 | W -1:000000000000 |
|
82 | W -1:000000000000 | |
83 | X 0:4e3505fd9583 |
|
83 | X 0:4e3505fd9583 | |
84 | Y 0:4e3505fd9583 |
|
84 | Y 0:4e3505fd9583 | |
85 | * Z 0:4e3505fd9583 |
|
85 | * Z 0:4e3505fd9583 | |
86 |
|
86 | |||
87 | delete a remote bookmark |
|
87 | delete a remote bookmark | |
88 |
|
88 | |||
89 | $ hg book -d W |
|
89 | $ hg book -d W | |
90 | $ hg push -B W ../a |
|
90 | $ hg push -B W ../a | |
91 | pushing to ../a |
|
91 | pushing to ../a | |
92 | searching for changes |
|
92 | searching for changes | |
93 | no changes found |
|
93 | no changes found | |
94 | deleting remote bookmark W |
|
94 | deleting remote bookmark W | |
95 | [1] |
|
95 | [1] | |
96 |
|
96 | |||
97 | push/pull name that doesn't exist |
|
97 | push/pull name that doesn't exist | |
98 |
|
98 | |||
99 | $ hg push -B badname ../a |
|
99 | $ hg push -B badname ../a | |
100 | pushing to ../a |
|
100 | pushing to ../a | |
101 | searching for changes |
|
101 | searching for changes | |
102 | no changes found |
|
102 | no changes found | |
103 | bookmark badname does not exist on the local or remote repository! |
|
103 | bookmark badname does not exist on the local or remote repository! | |
104 | [2] |
|
104 | [2] | |
105 | $ hg pull -B anotherbadname ../a |
|
105 | $ hg pull -B anotherbadname ../a | |
106 | pulling from ../a |
|
106 | pulling from ../a | |
107 | abort: remote bookmark anotherbadname not found! |
|
107 | abort: remote bookmark anotherbadname not found! | |
108 | [255] |
|
108 | [255] | |
109 |
|
109 | |||
110 | divergent bookmarks |
|
110 | divergent bookmarks | |
111 |
|
111 | |||
112 | $ cd ../a |
|
112 | $ cd ../a | |
113 | $ echo c1 > f1 |
|
113 | $ echo c1 > f1 | |
114 | $ hg ci -Am1 |
|
114 | $ hg ci -Am1 | |
115 | adding f1 |
|
115 | adding f1 | |
116 | $ hg book -f @ |
|
116 | $ hg book -f @ | |
117 | $ hg book -f X |
|
117 | $ hg book -f X | |
118 | $ hg book |
|
118 | $ hg book | |
119 | @ 1:0d2164f0ce0d |
|
119 | @ 1:0d2164f0ce0d | |
120 | * X 1:0d2164f0ce0d |
|
120 | * X 1:0d2164f0ce0d | |
121 | Y 0:4e3505fd9583 |
|
121 | Y 0:4e3505fd9583 | |
122 | Z 1:0d2164f0ce0d |
|
122 | Z 1:0d2164f0ce0d | |
123 |
|
123 | |||
124 | $ cd ../b |
|
124 | $ cd ../b | |
125 | $ hg up |
|
125 | $ hg up | |
126 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
126 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
127 | updating bookmark foobar |
|
127 | updating bookmark foobar | |
128 | $ echo c2 > f2 |
|
128 | $ echo c2 > f2 | |
129 | $ hg ci -Am2 |
|
129 | $ hg ci -Am2 | |
130 | adding f2 |
|
130 | adding f2 | |
131 | $ hg book -f @ |
|
131 | $ hg book -if @ | |
132 | $ hg book -f X |
|
132 | $ hg book -if X | |
133 | $ hg book |
|
133 | $ hg book | |
134 | @ 1:9b140be10808 |
|
134 | @ 1:9b140be10808 | |
135 |
|
|
135 | X 1:9b140be10808 | |
136 | Y 0:4e3505fd9583 |
|
136 | Y 0:4e3505fd9583 | |
137 | Z 0:4e3505fd9583 |
|
137 | Z 0:4e3505fd9583 | |
138 | foo -1:000000000000 |
|
138 | foo -1:000000000000 | |
139 |
|
|
139 | * foobar 1:9b140be10808 | |
140 |
|
140 | |||
141 | $ hg pull --config paths.foo=../a foo |
|
141 | $ hg pull --config paths.foo=../a foo | |
142 | pulling from $TESTTMP/a (glob) |
|
142 | pulling from $TESTTMP/a (glob) | |
143 | searching for changes |
|
143 | searching for changes | |
144 | adding changesets |
|
144 | adding changesets | |
145 | adding manifests |
|
145 | adding manifests | |
146 | adding file changes |
|
146 | adding file changes | |
147 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
147 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
148 | divergent bookmark @ stored as @foo |
|
148 | divergent bookmark @ stored as @foo | |
149 | divergent bookmark X stored as X@foo |
|
149 | divergent bookmark X stored as X@foo | |
150 | updating bookmark Z |
|
150 | updating bookmark Z | |
151 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
151 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
152 | $ hg book |
|
152 | $ hg book | |
153 | @ 1:9b140be10808 |
|
153 | @ 1:9b140be10808 | |
154 | @foo 2:0d2164f0ce0d |
|
154 | @foo 2:0d2164f0ce0d | |
155 |
|
|
155 | X 1:9b140be10808 | |
156 | X@foo 2:0d2164f0ce0d |
|
156 | X@foo 2:0d2164f0ce0d | |
157 | Y 0:4e3505fd9583 |
|
157 | Y 0:4e3505fd9583 | |
158 | Z 2:0d2164f0ce0d |
|
158 | Z 2:0d2164f0ce0d | |
159 | foo -1:000000000000 |
|
159 | foo -1:000000000000 | |
160 |
|
|
160 | * foobar 1:9b140be10808 | |
161 | $ hg push -f ../a |
|
161 | $ hg push -f ../a | |
162 | pushing to ../a |
|
162 | pushing to ../a | |
163 | searching for changes |
|
163 | searching for changes | |
164 | adding changesets |
|
164 | adding changesets | |
165 | adding manifests |
|
165 | adding manifests | |
166 | adding file changes |
|
166 | adding file changes | |
167 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
167 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
168 | $ hg -R ../a book |
|
168 | $ hg -R ../a book | |
169 | @ 1:0d2164f0ce0d |
|
169 | @ 1:0d2164f0ce0d | |
170 | * X 1:0d2164f0ce0d |
|
170 | * X 1:0d2164f0ce0d | |
171 | Y 0:4e3505fd9583 |
|
171 | Y 0:4e3505fd9583 | |
172 | Z 1:0d2164f0ce0d |
|
172 | Z 1:0d2164f0ce0d | |
173 |
|
173 | |||
174 | update a remote bookmark from a non-head to a head |
|
174 | update a remote bookmark from a non-head to a head | |
175 |
|
175 | |||
176 | $ hg up -q Y |
|
176 | $ hg up -q Y | |
177 | $ echo c3 > f2 |
|
177 | $ echo c3 > f2 | |
178 | $ hg ci -Am3 |
|
178 | $ hg ci -Am3 | |
179 | adding f2 |
|
179 | adding f2 | |
180 | created new head |
|
180 | created new head | |
181 | $ hg push ../a |
|
181 | $ hg push ../a | |
182 | pushing to ../a |
|
182 | pushing to ../a | |
183 | searching for changes |
|
183 | searching for changes | |
184 | adding changesets |
|
184 | adding changesets | |
185 | adding manifests |
|
185 | adding manifests | |
186 | adding file changes |
|
186 | adding file changes | |
187 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
187 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
188 | updating bookmark Y |
|
188 | updating bookmark Y | |
189 | $ hg -R ../a book |
|
189 | $ hg -R ../a book | |
190 | @ 1:0d2164f0ce0d |
|
190 | @ 1:0d2164f0ce0d | |
191 | * X 1:0d2164f0ce0d |
|
191 | * X 1:0d2164f0ce0d | |
192 | Y 3:f6fc62dde3c0 |
|
192 | Y 3:f6fc62dde3c0 | |
193 | Z 1:0d2164f0ce0d |
|
193 | Z 1:0d2164f0ce0d | |
194 |
|
194 | |||
195 | diverging a remote bookmark fails |
|
195 | diverging a remote bookmark fails | |
196 |
|
196 | |||
197 | $ hg up -q 4e3505fd9583 |
|
197 | $ hg up -q 4e3505fd9583 | |
198 | $ echo c4 > f2 |
|
198 | $ echo c4 > f2 | |
199 | $ hg ci -Am4 |
|
199 | $ hg ci -Am4 | |
200 | adding f2 |
|
200 | adding f2 | |
201 | created new head |
|
201 | created new head | |
202 | $ echo c5 > f2 |
|
202 | $ echo c5 > f2 | |
203 | $ hg ci -Am5 |
|
203 | $ hg ci -Am5 | |
204 | $ hg log -G |
|
204 | $ hg log -G | |
205 | @ 5:c922c0139ca0 5 |
|
205 | @ 5:c922c0139ca0 5 | |
206 | | |
|
206 | | | |
207 | o 4:4efff6d98829 4 |
|
207 | o 4:4efff6d98829 4 | |
208 | | |
|
208 | | | |
209 | | o 3:f6fc62dde3c0 3 |
|
209 | | o 3:f6fc62dde3c0 3 | |
210 | |/ |
|
210 | |/ | |
211 | | o 2:0d2164f0ce0d 1 |
|
211 | | o 2:0d2164f0ce0d 1 | |
212 | |/ |
|
212 | |/ | |
213 | | o 1:9b140be10808 2 |
|
213 | | o 1:9b140be10808 2 | |
214 | |/ |
|
214 | |/ | |
215 | o 0:4e3505fd9583 test |
|
215 | o 0:4e3505fd9583 test | |
216 |
|
216 | |||
217 |
|
217 | |||
218 | $ hg book -f Y |
|
218 | $ hg book -f Y | |
219 |
|
219 | |||
220 | $ cat <<EOF > ../a/.hg/hgrc |
|
220 | $ cat <<EOF > ../a/.hg/hgrc | |
221 | > [web] |
|
221 | > [web] | |
222 | > push_ssl = false |
|
222 | > push_ssl = false | |
223 | > allow_push = * |
|
223 | > allow_push = * | |
224 | > EOF |
|
224 | > EOF | |
225 |
|
225 | |||
226 | $ hg -R ../a serve -p $HGPORT2 -d --pid-file=../hg2.pid |
|
226 | $ hg -R ../a serve -p $HGPORT2 -d --pid-file=../hg2.pid | |
227 | $ cat ../hg2.pid >> $DAEMON_PIDS |
|
227 | $ cat ../hg2.pid >> $DAEMON_PIDS | |
228 |
|
228 | |||
229 | $ hg push http://localhost:$HGPORT2/ |
|
229 | $ hg push http://localhost:$HGPORT2/ | |
230 | pushing to http://localhost:$HGPORT2/ |
|
230 | pushing to http://localhost:$HGPORT2/ | |
231 | searching for changes |
|
231 | searching for changes | |
232 | abort: push creates new remote head c922c0139ca0! |
|
232 | abort: push creates new remote head c922c0139ca0! | |
233 | (did you forget to merge? use push -f to force) |
|
233 | (did you forget to merge? use push -f to force) | |
234 | [255] |
|
234 | [255] | |
235 | $ hg -R ../a book |
|
235 | $ hg -R ../a book | |
236 | @ 1:0d2164f0ce0d |
|
236 | @ 1:0d2164f0ce0d | |
237 | * X 1:0d2164f0ce0d |
|
237 | * X 1:0d2164f0ce0d | |
238 | Y 3:f6fc62dde3c0 |
|
238 | Y 3:f6fc62dde3c0 | |
239 | Z 1:0d2164f0ce0d |
|
239 | Z 1:0d2164f0ce0d | |
240 |
|
240 | |||
241 |
|
241 | |||
242 | Unrelated marker does not alter the decision |
|
242 | Unrelated marker does not alter the decision | |
243 |
|
243 | |||
244 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
244 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
245 | $ hg push http://localhost:$HGPORT2/ |
|
245 | $ hg push http://localhost:$HGPORT2/ | |
246 | pushing to http://localhost:$HGPORT2/ |
|
246 | pushing to http://localhost:$HGPORT2/ | |
247 | searching for changes |
|
247 | searching for changes | |
248 | abort: push creates new remote head c922c0139ca0! |
|
248 | abort: push creates new remote head c922c0139ca0! | |
249 | (did you forget to merge? use push -f to force) |
|
249 | (did you forget to merge? use push -f to force) | |
250 | [255] |
|
250 | [255] | |
251 | $ hg -R ../a book |
|
251 | $ hg -R ../a book | |
252 | @ 1:0d2164f0ce0d |
|
252 | @ 1:0d2164f0ce0d | |
253 | * X 1:0d2164f0ce0d |
|
253 | * X 1:0d2164f0ce0d | |
254 | Y 3:f6fc62dde3c0 |
|
254 | Y 3:f6fc62dde3c0 | |
255 | Z 1:0d2164f0ce0d |
|
255 | Z 1:0d2164f0ce0d | |
256 |
|
256 | |||
257 | Update to a successor works |
|
257 | Update to a successor works | |
258 |
|
258 | |||
259 | $ hg id --debug -r 3 |
|
259 | $ hg id --debug -r 3 | |
260 | f6fc62dde3c0771e29704af56ba4d8af77abcc2f |
|
260 | f6fc62dde3c0771e29704af56ba4d8af77abcc2f | |
261 | $ hg id --debug -r 4 |
|
261 | $ hg id --debug -r 4 | |
262 | 4efff6d98829d9c824c621afd6e3f01865f5439f |
|
262 | 4efff6d98829d9c824c621afd6e3f01865f5439f | |
263 | $ hg id --debug -r 5 |
|
263 | $ hg id --debug -r 5 | |
264 | c922c0139ca03858f655e4a2af4dd02796a63969 tip Y |
|
264 | c922c0139ca03858f655e4a2af4dd02796a63969 tip Y | |
265 | $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc |
|
265 | $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc | |
266 | $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f |
|
266 | $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f | |
267 | $ hg push http://localhost:$HGPORT2/ |
|
267 | $ hg push http://localhost:$HGPORT2/ | |
268 | pushing to http://localhost:$HGPORT2/ |
|
268 | pushing to http://localhost:$HGPORT2/ | |
269 | searching for changes |
|
269 | searching for changes | |
270 | remote: adding changesets |
|
270 | remote: adding changesets | |
271 | remote: adding manifests |
|
271 | remote: adding manifests | |
272 | remote: adding file changes |
|
272 | remote: adding file changes | |
273 | remote: added 2 changesets with 2 changes to 1 files (+1 heads) |
|
273 | remote: added 2 changesets with 2 changes to 1 files (+1 heads) | |
274 | updating bookmark Y |
|
274 | updating bookmark Y | |
275 | $ hg -R ../a book |
|
275 | $ hg -R ../a book | |
276 | @ 1:0d2164f0ce0d |
|
276 | @ 1:0d2164f0ce0d | |
277 | * X 1:0d2164f0ce0d |
|
277 | * X 1:0d2164f0ce0d | |
278 | Y 5:c922c0139ca0 |
|
278 | Y 5:c922c0139ca0 | |
279 | Z 1:0d2164f0ce0d |
|
279 | Z 1:0d2164f0ce0d | |
280 |
|
280 | |||
281 | hgweb |
|
281 | hgweb | |
282 |
|
282 | |||
283 | $ cat <<EOF > .hg/hgrc |
|
283 | $ cat <<EOF > .hg/hgrc | |
284 | > [web] |
|
284 | > [web] | |
285 | > push_ssl = false |
|
285 | > push_ssl = false | |
286 | > allow_push = * |
|
286 | > allow_push = * | |
287 | > EOF |
|
287 | > EOF | |
288 |
|
288 | |||
289 | $ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log |
|
289 | $ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log | |
290 | $ cat ../hg.pid >> $DAEMON_PIDS |
|
290 | $ cat ../hg.pid >> $DAEMON_PIDS | |
291 | $ cd ../a |
|
291 | $ cd ../a | |
292 |
|
292 | |||
293 | $ hg debugpushkey http://localhost:$HGPORT/ namespaces |
|
293 | $ hg debugpushkey http://localhost:$HGPORT/ namespaces | |
294 | bookmarks |
|
294 | bookmarks | |
295 | namespaces |
|
295 | namespaces | |
296 | obsolete |
|
296 | obsolete | |
297 | phases |
|
297 | phases | |
298 | $ hg debugpushkey http://localhost:$HGPORT/ bookmarks |
|
298 | $ hg debugpushkey http://localhost:$HGPORT/ bookmarks | |
299 | @ 9b140be1080824d768c5a4691a564088eede71f9 |
|
299 | @ 9b140be1080824d768c5a4691a564088eede71f9 | |
300 | X 9b140be1080824d768c5a4691a564088eede71f9 |
|
300 | X 9b140be1080824d768c5a4691a564088eede71f9 | |
301 | Y c922c0139ca03858f655e4a2af4dd02796a63969 |
|
301 | Y c922c0139ca03858f655e4a2af4dd02796a63969 | |
302 | Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c |
|
302 | Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c | |
303 | foo 0000000000000000000000000000000000000000 |
|
303 | foo 0000000000000000000000000000000000000000 | |
304 | foobar 9b140be1080824d768c5a4691a564088eede71f9 |
|
304 | foobar 9b140be1080824d768c5a4691a564088eede71f9 | |
305 | $ hg out -B http://localhost:$HGPORT/ |
|
305 | $ hg out -B http://localhost:$HGPORT/ | |
306 | comparing with http://localhost:$HGPORT/ |
|
306 | comparing with http://localhost:$HGPORT/ | |
307 | searching for changed bookmarks |
|
307 | searching for changed bookmarks | |
308 | no changed bookmarks found |
|
308 | no changed bookmarks found | |
309 | [1] |
|
309 | [1] | |
310 | $ hg push -B Z http://localhost:$HGPORT/ |
|
310 | $ hg push -B Z http://localhost:$HGPORT/ | |
311 | pushing to http://localhost:$HGPORT/ |
|
311 | pushing to http://localhost:$HGPORT/ | |
312 | searching for changes |
|
312 | searching for changes | |
313 | no changes found |
|
313 | no changes found | |
314 | exporting bookmark Z |
|
314 | exporting bookmark Z | |
315 | [1] |
|
315 | [1] | |
316 | $ hg book -d Z |
|
316 | $ hg book -d Z | |
317 | $ hg in -B http://localhost:$HGPORT/ |
|
317 | $ hg in -B http://localhost:$HGPORT/ | |
318 | comparing with http://localhost:$HGPORT/ |
|
318 | comparing with http://localhost:$HGPORT/ | |
319 | searching for changed bookmarks |
|
319 | searching for changed bookmarks | |
320 | Z 0d2164f0ce0d |
|
320 | Z 0d2164f0ce0d | |
321 | foo 000000000000 |
|
321 | foo 000000000000 | |
322 | foobar 9b140be10808 |
|
322 | foobar 9b140be10808 | |
323 | $ hg pull -B Z http://localhost:$HGPORT/ |
|
323 | $ hg pull -B Z http://localhost:$HGPORT/ | |
324 | pulling from http://localhost:$HGPORT/ |
|
324 | pulling from http://localhost:$HGPORT/ | |
325 | no changes found |
|
325 | no changes found | |
326 | divergent bookmark @ stored as @1 |
|
326 | divergent bookmark @ stored as @1 | |
327 | divergent bookmark X stored as X@1 |
|
327 | divergent bookmark X stored as X@1 | |
328 | adding remote bookmark Z |
|
328 | adding remote bookmark Z | |
329 | adding remote bookmark foo |
|
329 | adding remote bookmark foo | |
330 | adding remote bookmark foobar |
|
330 | adding remote bookmark foobar | |
331 | importing bookmark Z |
|
331 | importing bookmark Z | |
332 | $ hg clone http://localhost:$HGPORT/ cloned-bookmarks |
|
332 | $ hg clone http://localhost:$HGPORT/ cloned-bookmarks | |
333 | requesting all changes |
|
333 | requesting all changes | |
334 | adding changesets |
|
334 | adding changesets | |
335 | adding manifests |
|
335 | adding manifests | |
336 | adding file changes |
|
336 | adding file changes | |
337 | added 5 changesets with 5 changes to 3 files (+2 heads) |
|
337 | added 5 changesets with 5 changes to 3 files (+2 heads) | |
338 | updating to bookmark @ |
|
338 | updating to bookmark @ | |
339 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
339 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
340 | $ hg -R cloned-bookmarks bookmarks |
|
340 | $ hg -R cloned-bookmarks bookmarks | |
341 | * @ 1:9b140be10808 |
|
341 | * @ 1:9b140be10808 | |
342 | X 1:9b140be10808 |
|
342 | X 1:9b140be10808 | |
343 | Y 4:c922c0139ca0 |
|
343 | Y 4:c922c0139ca0 | |
344 | Z 2:0d2164f0ce0d |
|
344 | Z 2:0d2164f0ce0d | |
345 | foo -1:000000000000 |
|
345 | foo -1:000000000000 | |
346 | foobar 1:9b140be10808 |
|
346 | foobar 1:9b140be10808 | |
347 |
|
347 | |||
348 | $ cd .. |
|
348 | $ cd .. | |
349 |
|
349 | |||
350 | Pushing a bookmark should only push the changes required by that |
|
350 | Pushing a bookmark should only push the changes required by that | |
351 | bookmark, not all outgoing changes: |
|
351 | bookmark, not all outgoing changes: | |
352 | $ hg clone http://localhost:$HGPORT/ addmarks |
|
352 | $ hg clone http://localhost:$HGPORT/ addmarks | |
353 | requesting all changes |
|
353 | requesting all changes | |
354 | adding changesets |
|
354 | adding changesets | |
355 | adding manifests |
|
355 | adding manifests | |
356 | adding file changes |
|
356 | adding file changes | |
357 | added 5 changesets with 5 changes to 3 files (+2 heads) |
|
357 | added 5 changesets with 5 changes to 3 files (+2 heads) | |
358 | updating to bookmark @ |
|
358 | updating to bookmark @ | |
359 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
359 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
360 | $ cd addmarks |
|
360 | $ cd addmarks | |
361 | $ echo foo > foo |
|
361 | $ echo foo > foo | |
362 | $ hg add foo |
|
362 | $ hg add foo | |
363 | $ hg commit -m 'add foo' |
|
363 | $ hg commit -m 'add foo' | |
364 | $ echo bar > bar |
|
364 | $ echo bar > bar | |
365 | $ hg add bar |
|
365 | $ hg add bar | |
366 | $ hg commit -m 'add bar' |
|
366 | $ hg commit -m 'add bar' | |
367 | $ hg co "tip^" |
|
367 | $ hg co "tip^" | |
368 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
368 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
369 | $ hg book add-foo |
|
369 | $ hg book add-foo | |
370 | $ hg book -r tip add-bar |
|
370 | $ hg book -r tip add-bar | |
371 | Note: this push *must* push only a single changeset, as that's the point |
|
371 | Note: this push *must* push only a single changeset, as that's the point | |
372 | of this test. |
|
372 | of this test. | |
373 | $ hg push -B add-foo --traceback |
|
373 | $ hg push -B add-foo --traceback | |
374 | pushing to http://localhost:$HGPORT/ |
|
374 | pushing to http://localhost:$HGPORT/ | |
375 | searching for changes |
|
375 | searching for changes | |
376 | remote: adding changesets |
|
376 | remote: adding changesets | |
377 | remote: adding manifests |
|
377 | remote: adding manifests | |
378 | remote: adding file changes |
|
378 | remote: adding file changes | |
379 | remote: added 1 changesets with 1 changes to 1 files |
|
379 | remote: added 1 changesets with 1 changes to 1 files | |
380 | updating bookmark @ failed! |
|
380 | updating bookmark @ failed! | |
381 | exporting bookmark add-foo |
|
381 | exporting bookmark add-foo | |
382 |
|
382 | |||
383 | $ cd .. |
|
383 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now