Mercurial > hg
comparison tests/test-bookmarks-pushpull.t @ 25441:58b766a21189
test: display pre-pull remote bookmark state when testing race condition
This makes it easier to read the test. This will be usefull for comming
changesets testing more race conditions.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 01 Jun 2015 17:54:29 -0700 |
| parents | efa2621c2859 |
| children | 9ee395dffac9 |
comparison
equal
deleted
inserted
replaced
| 25440:1a95c57959f6 | 25441:58b766a21189 |
|---|---|
| 272 $ cat <<EOF > .hg/hgrc | 272 $ cat <<EOF > .hg/hgrc |
| 273 > [hooks] | 273 > [hooks] |
| 274 > outgoing.makecommit = hg ci -Am5; echo committed in pull-race | 274 > outgoing.makecommit = hg ci -Am5; echo committed in pull-race |
| 275 > EOF | 275 > EOF |
| 276 $ cd ../pull-race2 | 276 $ cd ../pull-race2 |
| 277 $ hg -R $TESTTMP/pull-race book | |
| 278 @ 1:0d2164f0ce0d | |
| 279 X 1:0d2164f0ce0d | |
| 280 * Y 4:b0a5eff05604 | |
| 281 Z 1:0d2164f0ce0d | |
| 277 $ hg pull | 282 $ hg pull |
| 278 pulling from $TESTTMP/pull-race (glob) | 283 pulling from $TESTTMP/pull-race (glob) |
| 279 searching for changes | 284 searching for changes |
| 280 adding f3 | 285 adding f3 |
| 281 committed in pull-race | 286 committed in pull-race |