view tests/test-rebase-pull.out @ 8144:fca54469480e

ui: introduce new config parser
author Matt Mackall <mpm@selenic.com>
date Thu, 23 Apr 2009 15:40:10 -0500
parents 92455c1d6f83
children dd1b47e17d7e
line wrap: on
line source

updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved

% Now b has one revision to be pulled from a
pulling from 
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
rebase completed
@  3:L1
|
o  2:R1
|
o  1:C2
|
o  0:C1


% Re-run pull --rebase
pulling from 
searching for changes
no changes found

% Invoke pull --rebase and nothing to rebase
pulling from 
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
nothing to rebase
@  2
|

% pull --rebase doesn't update if nothing has been pulled
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
pulling from 
searching for changes
no changes found
o  2
|