equal
deleted
inserted
replaced
126 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
126 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
127 updating bookmark foobar |
127 updating bookmark foobar |
128 $ echo c2 > f2 |
128 $ echo c2 > f2 |
129 $ hg ci -Am2 |
129 $ hg ci -Am2 |
130 adding f2 |
130 adding f2 |
131 $ hg book -f @ |
131 $ hg book -if @ |
132 $ hg book -f X |
132 $ hg book -if X |
133 $ hg book |
133 $ hg book |
134 @ 1:9b140be10808 |
134 @ 1:9b140be10808 |
135 * X 1:9b140be10808 |
135 X 1:9b140be10808 |
136 Y 0:4e3505fd9583 |
136 Y 0:4e3505fd9583 |
137 Z 0:4e3505fd9583 |
137 Z 0:4e3505fd9583 |
138 foo -1:000000000000 |
138 foo -1:000000000000 |
139 foobar 1:9b140be10808 |
139 * foobar 1:9b140be10808 |
140 |
140 |
141 $ hg pull --config paths.foo=../a foo |
141 $ hg pull --config paths.foo=../a foo |
142 pulling from $TESTTMP/a (glob) |
142 pulling from $TESTTMP/a (glob) |
143 searching for changes |
143 searching for changes |
144 adding changesets |
144 adding changesets |
150 updating bookmark Z |
150 updating bookmark Z |
151 (run 'hg heads' to see heads, 'hg merge' to merge) |
151 (run 'hg heads' to see heads, 'hg merge' to merge) |
152 $ hg book |
152 $ hg book |
153 @ 1:9b140be10808 |
153 @ 1:9b140be10808 |
154 @foo 2:0d2164f0ce0d |
154 @foo 2:0d2164f0ce0d |
155 * X 1:9b140be10808 |
155 X 1:9b140be10808 |
156 X@foo 2:0d2164f0ce0d |
156 X@foo 2:0d2164f0ce0d |
157 Y 0:4e3505fd9583 |
157 Y 0:4e3505fd9583 |
158 Z 2:0d2164f0ce0d |
158 Z 2:0d2164f0ce0d |
159 foo -1:000000000000 |
159 foo -1:000000000000 |
160 foobar 1:9b140be10808 |
160 * foobar 1:9b140be10808 |
161 $ hg push -f ../a |
161 $ hg push -f ../a |
162 pushing to ../a |
162 pushing to ../a |
163 searching for changes |
163 searching for changes |
164 adding changesets |
164 adding changesets |
165 adding manifests |
165 adding manifests |