equal
deleted
inserted
replaced
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 revsets should not ignore divergent bookmarks |
|
175 |
|
176 $ hg bookmark -fr 1 Z |
|
177 $ hg log -r 'bookmark()' --template '{rev}:{node|short} {bookmarks}\n' |
|
178 0:4e3505fd9583 Y |
|
179 1:9b140be10808 @ X Z foobar |
|
180 2:0d2164f0ce0d @foo X@foo |
|
181 $ hg log -r 'bookmark("X@foo")' --template '{rev}:{node|short} {bookmarks}\n' |
|
182 2:0d2164f0ce0d @foo X@foo |
|
183 $ hg log -r 'bookmark("re:X@foo")' --template '{rev}:{node|short} {bookmarks}\n' |
|
184 2:0d2164f0ce0d @foo X@foo |
|
185 |
174 update a remote bookmark from a non-head to a head |
186 update a remote bookmark from a non-head to a head |
175 |
187 |
176 $ hg up -q Y |
188 $ hg up -q Y |
177 $ echo c3 > f2 |
189 $ echo c3 > f2 |
178 $ hg ci -Am3 |
190 $ hg ci -Am3 |
297 phases |
309 phases |
298 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks |
310 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks |
299 @ 9b140be1080824d768c5a4691a564088eede71f9 |
311 @ 9b140be1080824d768c5a4691a564088eede71f9 |
300 X 9b140be1080824d768c5a4691a564088eede71f9 |
312 X 9b140be1080824d768c5a4691a564088eede71f9 |
301 Y c922c0139ca03858f655e4a2af4dd02796a63969 |
313 Y c922c0139ca03858f655e4a2af4dd02796a63969 |
302 Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c |
314 Z 9b140be1080824d768c5a4691a564088eede71f9 |
303 foo 0000000000000000000000000000000000000000 |
315 foo 0000000000000000000000000000000000000000 |
304 foobar 9b140be1080824d768c5a4691a564088eede71f9 |
316 foobar 9b140be1080824d768c5a4691a564088eede71f9 |
305 $ hg out -B http://localhost:$HGPORT/ |
317 $ hg out -B http://localhost:$HGPORT/ |
306 comparing with http://localhost:$HGPORT/ |
318 comparing with http://localhost:$HGPORT/ |
307 searching for changed bookmarks |
319 searching for changed bookmarks |