Mercurial > hg
comparison tests/test-bookmarks-pushpull.t @ 23543:4dd8a6a1240d
spelling: fixes from proofreading of spell checker issues
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 17 Apr 2014 22:47:38 +0200 |
| parents | 53a65929ef1f |
| children | 3f6bf9f29e7b |
comparison
equal
deleted
inserted
replaced
| 23542:8b5adc6b72ae | 23543:4dd8a6a1240d |
|---|---|
| 53 $ hg debugpushkey ../a bookmarks | 53 $ hg debugpushkey ../a bookmarks |
| 54 X 4e3505fd95835d721066b76e75dbb8cc554d7f77 | 54 X 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
| 55 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 | 55 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
| 56 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 | 56 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
| 57 | 57 |
| 58 delete the bookmark to repull it | 58 delete the bookmark to re-pull it |
| 59 | 59 |
| 60 $ hg book -d X | 60 $ hg book -d X |
| 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 |
| 175 @ 1:0d2164f0ce0d | 175 @ 1:0d2164f0ce0d |
| 176 * X 1:0d2164f0ce0d | 176 * X 1:0d2164f0ce0d |
| 177 Y 0:4e3505fd9583 | 177 Y 0:4e3505fd9583 |
| 178 Z 1:0d2164f0ce0d | 178 Z 1:0d2164f0ce0d |
| 179 | 179 |
| 180 explicite pull should overwrite the local version (issue4439) | 180 explicit pull should overwrite the local version (issue4439) |
| 181 | 181 |
| 182 $ hg pull --config paths.foo=../a foo -B X | 182 $ hg pull --config paths.foo=../a foo -B X |
| 183 pulling from $TESTTMP/a (glob) | 183 pulling from $TESTTMP/a (glob) |
| 184 no changes found | 184 no changes found |
| 185 divergent bookmark @ stored as @foo | 185 divergent bookmark @ stored as @foo |