equal
deleted
inserted
replaced
108 * X 1:9b140be10808 |
108 * X 1:9b140be10808 |
109 Y 0:4e3505fd9583 |
109 Y 0:4e3505fd9583 |
110 foo -1:000000000000 |
110 foo -1:000000000000 |
111 foobar -1:000000000000 |
111 foobar -1:000000000000 |
112 |
112 |
113 $ hg pull ../a |
113 $ hg pull --config paths.foo=../a foo |
114 pulling from ../a |
114 pulling from $TESTTMP/a |
115 searching for changes |
115 searching for changes |
116 adding changesets |
116 adding changesets |
117 adding manifests |
117 adding manifests |
118 adding file changes |
118 adding file changes |
119 added 1 changesets with 1 changes to 1 files (+1 heads) |
119 added 1 changesets with 1 changes to 1 files (+1 heads) |
120 divergent bookmark X stored as X@1 |
120 divergent bookmark X stored as X@foo |
121 (run 'hg heads' to see heads, 'hg merge' to merge) |
121 (run 'hg heads' to see heads, 'hg merge' to merge) |
122 $ hg book |
122 $ hg book |
123 * X 1:9b140be10808 |
123 * X 1:9b140be10808 |
124 X@1 2:0d2164f0ce0d |
124 X@foo 2:0d2164f0ce0d |
125 Y 0:4e3505fd9583 |
125 Y 0:4e3505fd9583 |
126 foo -1:000000000000 |
126 foo -1:000000000000 |
127 foobar -1:000000000000 |
127 foobar -1:000000000000 |
128 $ hg push -f ../a |
128 $ hg push -f ../a |
129 pushing to ../a |
129 pushing to ../a |