Show More
@@ -57,7 +57,7 b' clone, commit, pull' | |||||
57 | (run 'hg update' to get a working copy) |
|
57 | (run 'hg update' to get a working copy) | |
58 | $ hg blackbox -l 3 |
|
58 | $ hg blackbox -l 3 | |
59 | 1970/01/01 00:00:00 bob> pull |
|
59 | 1970/01/01 00:00:00 bob> pull | |
60 |
1970/01/01 00:00:00 bob> 1 incoming changes - new heads: d02f48003e62 |
|
60 | 1970/01/01 00:00:00 bob> 1 incoming changes - new heads: d02f48003e62 | |
61 | 1970/01/01 00:00:00 bob> pull exited None after * seconds (glob) |
|
61 | 1970/01/01 00:00:00 bob> pull exited None after * seconds (glob) | |
62 |
|
62 | |||
63 | extension and python hooks - use the eol extension for a pythonhook |
|
63 | extension and python hooks - use the eol extension for a pythonhook |
@@ -152,7 +152,7 b' issue3712: test colorization of subrepo ' | |||||
152 | c |
|
152 | c | |
153 | c |
|
153 | c | |
154 | \x1b[0;32m+aa\x1b[0m (esc) |
|
154 | \x1b[0;32m+aa\x1b[0m (esc) | |
155 |
\x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m ( |
|
155 | \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (esc) | |
156 | \x1b[0;31;1m--- a/sub/b\x1b[0m (esc) |
|
156 | \x1b[0;31;1m--- a/sub/b\x1b[0m (esc) | |
157 | \x1b[0;32;1m+++ b/sub/b\x1b[0m (esc) |
|
157 | \x1b[0;32;1m+++ b/sub/b\x1b[0m (esc) | |
158 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) |
|
158 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) |
@@ -269,9 +269,9 b' clone' | |||||
269 | $ cd .. |
|
269 | $ cd .. | |
270 | $ hg clone t tc |
|
270 | $ hg clone t tc | |
271 | updating to branch default |
|
271 | updating to branch default | |
272 |
cloning subrepo s from $TESTTMP/t/s |
|
272 | cloning subrepo s from $TESTTMP/t/s | |
273 | cloning subrepo s/ss from $TESTTMP/t/s/ss (glob) |
|
273 | cloning subrepo s/ss from $TESTTMP/t/s/ss (glob) | |
274 |
cloning subrepo t from $TESTTMP/t/t |
|
274 | cloning subrepo t from $TESTTMP/t/t | |
275 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
275 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
276 | $ cd tc |
|
276 | $ cd tc | |
277 | $ hg debugsub |
|
277 | $ hg debugsub | |
@@ -292,10 +292,10 b' push' | |||||
292 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
|
292 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) | |
293 | searching for changes |
|
293 | searching for changes | |
294 | no changes found |
|
294 | no changes found | |
295 |
pushing subrepo s to $TESTTMP/t/s |
|
295 | pushing subrepo s to $TESTTMP/t/s | |
296 | searching for changes |
|
296 | searching for changes | |
297 | no changes found |
|
297 | no changes found | |
298 |
pushing subrepo t to $TESTTMP/t/t |
|
298 | pushing subrepo t to $TESTTMP/t/t | |
299 | searching for changes |
|
299 | searching for changes | |
300 | adding changesets |
|
300 | adding changesets | |
301 | adding manifests |
|
301 | adding manifests | |
@@ -317,7 +317,7 b' push -f' | |||||
317 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
|
317 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) | |
318 | searching for changes |
|
318 | searching for changes | |
319 | no changes found |
|
319 | no changes found | |
320 |
pushing subrepo s to $TESTTMP/t/s |
|
320 | pushing subrepo s to $TESTTMP/t/s | |
321 | searching for changes |
|
321 | searching for changes | |
322 | abort: push creates new remote head 12a213df6fa9! (in subrepo s) |
|
322 | abort: push creates new remote head 12a213df6fa9! (in subrepo s) | |
323 | (did you forget to merge? use push -f to force) |
|
323 | (did you forget to merge? use push -f to force) | |
@@ -327,13 +327,13 b' push -f' | |||||
327 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
|
327 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) | |
328 | searching for changes |
|
328 | searching for changes | |
329 | no changes found |
|
329 | no changes found | |
330 |
pushing subrepo s to $TESTTMP/t/s |
|
330 | pushing subrepo s to $TESTTMP/t/s | |
331 | searching for changes |
|
331 | searching for changes | |
332 | adding changesets |
|
332 | adding changesets | |
333 | adding manifests |
|
333 | adding manifests | |
334 | adding file changes |
|
334 | adding file changes | |
335 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
335 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
336 |
pushing subrepo t to $TESTTMP/t/t |
|
336 | pushing subrepo t to $TESTTMP/t/t | |
337 | searching for changes |
|
337 | searching for changes | |
338 | no changes found |
|
338 | no changes found | |
339 | searching for changes |
|
339 | searching for changes | |
@@ -366,7 +366,7 b' pull' | |||||
366 | should pull t |
|
366 | should pull t | |
367 |
|
367 | |||
368 | $ hg up |
|
368 | $ hg up | |
369 |
pulling subrepo t from $TESTTMP/t/t |
|
369 | pulling subrepo t from $TESTTMP/t/t | |
370 | searching for changes |
|
370 | searching for changes | |
371 | adding changesets |
|
371 | adding changesets | |
372 | adding manifests |
|
372 | adding manifests | |
@@ -572,7 +572,7 b' Issue1977: multirepo push should fail if' | |||||
572 | adding .hgsub |
|
572 | adding .hgsub | |
573 | $ hg clone repo repo2 |
|
573 | $ hg clone repo repo2 | |
574 | updating to branch default |
|
574 | updating to branch default | |
575 |
cloning subrepo s from $TESTTMP/repo/s |
|
575 | cloning subrepo s from $TESTTMP/repo/s | |
576 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
576 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
577 | $ hg -q -R repo2 pull -u |
|
577 | $ hg -q -R repo2 pull -u | |
578 | $ echo 1 > repo2/s/a |
|
578 | $ echo 1 > repo2/s/a |
General Comments 0
You need to be logged in to leave comments.
Login now