Mercurial > hg
comparison tests/test-bookmarks-pushpull.t @ 15935:6c97eb445341
bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 19 Jan 2012 14:07:48 -0600 |
| parents | 79cc89de5be1 |
| children | c7811ca6fb94 |
comparison
equal
deleted
inserted
replaced
| 15934:9d4b5c3cb853 | 15935:6c97eb445341 |
|---|---|
| 107 $ hg book -f X | 107 $ hg book -f X |
| 108 $ hg book | 108 $ hg book |
| 109 * X 1:9b140be10808 | 109 * X 1:9b140be10808 |
| 110 Y 0:4e3505fd9583 | 110 Y 0:4e3505fd9583 |
| 111 foo -1:000000000000 | 111 foo -1:000000000000 |
| 112 foobar -1:000000000000 | 112 foobar 1:9b140be10808 |
| 113 | 113 |
| 114 $ hg pull --config paths.foo=../a foo | 114 $ hg pull --config paths.foo=../a foo |
| 115 pulling from $TESTTMP/a | 115 pulling from $TESTTMP/a |
| 116 searching for changes | 116 searching for changes |
| 117 adding changesets | 117 adding changesets |
| 123 $ hg book | 123 $ hg book |
| 124 * X 1:9b140be10808 | 124 * X 1:9b140be10808 |
| 125 X@foo 2:0d2164f0ce0d | 125 X@foo 2:0d2164f0ce0d |
| 126 Y 0:4e3505fd9583 | 126 Y 0:4e3505fd9583 |
| 127 foo -1:000000000000 | 127 foo -1:000000000000 |
| 128 foobar -1:000000000000 | 128 foobar 1:9b140be10808 |
| 129 $ hg push -f ../a | 129 $ hg push -f ../a |
| 130 pushing to ../a | 130 pushing to ../a |
| 131 searching for changes | 131 searching for changes |
| 132 adding changesets | 132 adding changesets |
| 133 adding manifests | 133 adding manifests |
| 156 namespaces | 156 namespaces |
| 157 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks | 157 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks |
| 158 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 | 158 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
| 159 X 9b140be1080824d768c5a4691a564088eede71f9 | 159 X 9b140be1080824d768c5a4691a564088eede71f9 |
| 160 foo 0000000000000000000000000000000000000000 | 160 foo 0000000000000000000000000000000000000000 |
| 161 foobar 0000000000000000000000000000000000000000 | 161 foobar 9b140be1080824d768c5a4691a564088eede71f9 |
| 162 $ hg out -B http://localhost:$HGPORT/ | 162 $ hg out -B http://localhost:$HGPORT/ |
| 163 comparing with http://localhost:$HGPORT/ | 163 comparing with http://localhost:$HGPORT/ |
| 164 searching for changed bookmarks | 164 searching for changed bookmarks |
| 165 Z 0d2164f0ce0d | 165 Z 0d2164f0ce0d |
| 166 $ hg push -B Z http://localhost:$HGPORT/ | 166 $ hg push -B Z http://localhost:$HGPORT/ |
| 172 $ hg in -B http://localhost:$HGPORT/ | 172 $ hg in -B http://localhost:$HGPORT/ |
| 173 comparing with http://localhost:$HGPORT/ | 173 comparing with http://localhost:$HGPORT/ |
| 174 searching for changed bookmarks | 174 searching for changed bookmarks |
| 175 Z 0d2164f0ce0d | 175 Z 0d2164f0ce0d |
| 176 foo 000000000000 | 176 foo 000000000000 |
| 177 foobar 000000000000 | 177 foobar 9b140be10808 |
| 178 $ hg pull -B Z http://localhost:$HGPORT/ | 178 $ hg pull -B Z http://localhost:$HGPORT/ |
| 179 pulling from http://localhost:$HGPORT/ | 179 pulling from http://localhost:$HGPORT/ |
| 180 no changes found | 180 no changes found |
| 181 divergent bookmark X stored as X@1 | 181 divergent bookmark X stored as X@1 |
| 182 importing bookmark Z | 182 importing bookmark Z |
| 191 $ hg -R cloned-bookmarks bookmarks | 191 $ hg -R cloned-bookmarks bookmarks |
| 192 X 1:9b140be10808 | 192 X 1:9b140be10808 |
| 193 Y 0:4e3505fd9583 | 193 Y 0:4e3505fd9583 |
| 194 Z 2:0d2164f0ce0d | 194 Z 2:0d2164f0ce0d |
| 195 foo -1:000000000000 | 195 foo -1:000000000000 |
| 196 foobar -1:000000000000 | 196 foobar 1:9b140be10808 |
| 197 | 197 |
| 198 $ kill `cat ../hg.pid` | 198 $ kill `cat ../hg.pid` |