Show More
@@ -128,15 +128,15 b' divergent bookmarks' | |||
|
128 | 128 | $ echo c2 > f2 |
|
129 | 129 | $ hg ci -Am2 |
|
130 | 130 | adding f2 |
|
131 | $ hg book -f @ | |
|
132 | $ hg book -f X | |
|
131 | $ hg book -if @ | |
|
132 | $ hg book -if X | |
|
133 | 133 | $ hg book |
|
134 | 134 | @ 1:9b140be10808 |
|
135 |
|
|
|
135 | X 1:9b140be10808 | |
|
136 | 136 | Y 0:4e3505fd9583 |
|
137 | 137 | Z 0:4e3505fd9583 |
|
138 | 138 | foo -1:000000000000 |
|
139 |
|
|
|
139 | * foobar 1:9b140be10808 | |
|
140 | 140 | |
|
141 | 141 | $ hg pull --config paths.foo=../a foo |
|
142 | 142 | pulling from $TESTTMP/a (glob) |
@@ -152,12 +152,12 b' divergent bookmarks' | |||
|
152 | 152 | $ hg book |
|
153 | 153 | @ 1:9b140be10808 |
|
154 | 154 | @foo 2:0d2164f0ce0d |
|
155 |
|
|
|
155 | X 1:9b140be10808 | |
|
156 | 156 | X@foo 2:0d2164f0ce0d |
|
157 | 157 | Y 0:4e3505fd9583 |
|
158 | 158 | Z 2:0d2164f0ce0d |
|
159 | 159 | foo -1:000000000000 |
|
160 |
|
|
|
160 | * foobar 1:9b140be10808 | |
|
161 | 161 | $ hg push -f ../a |
|
162 | 162 | pushing to ../a |
|
163 | 163 | searching for changes |
General Comments 0
You need to be logged in to leave comments.
Login now