equal
deleted
inserted
replaced
201 foo -1:000000000000 |
201 foo -1:000000000000 |
202 * foobar 1:9b140be10808 |
202 * foobar 1:9b140be10808 |
203 |
203 |
204 (test that too many divergence of bookmark) |
204 (test that too many divergence of bookmark) |
205 |
205 |
206 $ python $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -r 000000000000 "X@${i}"; done |
206 $ $PYTHON $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -r 000000000000 "X@${i}"; done |
207 $ hg pull ../a |
207 $ hg pull ../a |
208 pulling from ../a |
208 pulling from ../a |
209 searching for changes |
209 searching for changes |
210 no changes found |
210 no changes found |
211 warning: failed to assign numbered name to divergent bookmark X |
211 warning: failed to assign numbered name to divergent bookmark X |
229 $ hg bookmarks | grep '^ @' |
229 $ hg bookmarks | grep '^ @' |
230 @ 1:9b140be10808 |
230 @ 1:9b140be10808 |
231 @1 2:0d2164f0ce0d |
231 @1 2:0d2164f0ce0d |
232 @foo 2:0d2164f0ce0d |
232 @foo 2:0d2164f0ce0d |
233 |
233 |
234 $ python $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -d "X@${i}"; done |
234 $ $PYTHON $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -d "X@${i}"; done |
235 $ hg bookmarks -d "@1" |
235 $ hg bookmarks -d "@1" |
236 |
236 |
237 $ hg push -f ../a |
237 $ hg push -f ../a |
238 pushing to ../a |
238 pushing to ../a |
239 searching for changes |
239 searching for changes |