163 added 1 changesets with 1 changes to 1 files |
163 added 1 changesets with 1 changes to 1 files |
164 new changesets a79b6597f322:c70aee6da07d |
164 new changesets a79b6597f322:c70aee6da07d |
165 (run 'hg heads .' to see heads, 'hg merge' to merge) |
165 (run 'hg heads .' to see heads, 'hg merge' to merge) |
166 $ hg log -r scratch/scratchontopofpublic -T '{phase}' |
166 $ hg log -r scratch/scratchontopofpublic -T '{phase}' |
167 draft (no-eol) |
167 draft (no-eol) |
168 Strip scratchontopofpublic commit and do hg update |
|
169 $ hg log -r tip -T '{node}\n' |
|
170 c70aee6da07d7cdb9897375473690df3a8563339 |
|
171 $ echo "[extensions]" >> .hg/hgrc |
|
172 $ echo "strip=" >> .hg/hgrc |
|
173 $ hg strip -q tip |
|
174 $ hg up c70aee6da07d7cdb9897375473690df3a8563339 |
|
175 'c70aee6da07d7cdb9897375473690df3a8563339' does not exist locally - looking for it remotely... |
|
176 pulling from ssh://user@dummy/repo |
|
177 searching for changes |
|
178 adding changesets |
|
179 adding manifests |
|
180 adding file changes |
|
181 added 1 changesets with 1 changes to 1 files |
|
182 new changesets c70aee6da07d |
|
183 (run 'hg update' to get a working copy) |
|
184 'c70aee6da07d7cdb9897375473690df3a8563339' found remotely |
|
185 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
186 |
|
187 Trying to pull from bad path |
|
188 $ hg strip -q tip |
|
189 $ hg --config paths.default=badpath up c70aee6da07d7cdb9897375473690df3a8563339 |
|
190 'c70aee6da07d7cdb9897375473690df3a8563339' does not exist locally - looking for it remotely... |
|
191 pulling from $TESTTMP/client2/badpath (glob) |
|
192 pull failed: repository $TESTTMP/client2/badpath not found |
|
193 abort: unknown revision 'c70aee6da07d7cdb9897375473690df3a8563339'! |
|
194 [255] |
|
195 |
|
196 Strip commit and pull it using hg update with bookmark name |
|
197 $ hg strip -q d8fde0ddfc96 |
|
198 $ hg book -d scratch/mybranch |
|
199 $ hg up scratch/mybranch |
|
200 'scratch/mybranch' does not exist locally - looking for it remotely... |
|
201 pulling from ssh://user@dummy/repo |
|
202 searching for changes |
|
203 adding changesets |
|
204 adding manifests |
|
205 adding file changes |
|
206 added 1 changesets with 1 changes to 2 files |
|
207 new changesets d8fde0ddfc96 |
|
208 (run 'hg update' to get a working copy) |
|
209 'scratch/mybranch' found remotely |
|
210 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
211 (activating bookmark scratch/mybranch) |
|
212 $ hg log -r scratch/mybranch -T '{node}' |
|
213 d8fde0ddfc962183977f92d2bc52d303b8840f9d (no-eol) |
|