228 |
228 |
229 |
229 |
230 make the bookmark move by updating it on a, and then pulling with a local change |
230 make the bookmark move by updating it on a, and then pulling with a local change |
231 # add a commit to a |
231 # add a commit to a |
232 $ cd ../a |
232 $ cd ../a |
233 $ hg up -C X |fgrep "activating bookmark X" |
233 $ hg up -C X |grep -F "activating bookmark X" |
234 (activating bookmark X) |
234 (activating bookmark X) |
235 # go back to b, and check out X |
235 # go back to b, and check out X |
236 $ cd ../b |
236 $ cd ../b |
237 $ hg up -C X |fgrep "activating bookmark X" |
237 $ hg up -C X |grep -F "activating bookmark X" |
238 (activating bookmark X) |
238 (activating bookmark X) |
239 # update and push from a |
239 # update and push from a |
240 $ make_changes ../a |
240 $ make_changes ../a |
241 created new head |
241 created new head |
242 $ echo "more" >> test |
242 $ echo "more" >> test |
243 $ hg pull -u 2>&1 | fgrep -v TESTTMP| fgrep -v "searching for changes" | fgrep -v adding |
243 $ hg pull -u 2>&1 | grep -F -v TESTTMP| grep -F -v "searching for changes" | grep -F -v adding |
244 pulling from $TESTTMP/a |
244 pulling from $TESTTMP/a |
245 updating bookmark X |
245 updating bookmark X |
246 added 1 changesets with 0 changes to 0 files (+1 heads) |
246 added 1 changesets with 0 changes to 0 files (+1 heads) |
247 new changesets * (glob) |
247 new changesets * (glob) |
248 updating to active bookmark X |
248 updating to active bookmark X |