Mercurial > hg
view tests/test-rebase-pull.out @ 10236:49a8625b8cac
shrink-revlog: help/doc tweaks
- make it look right in 'hg help extensions'
- clarify --revlog option
- add a main program to tell users this is no longer a standalone script
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Tue, 12 Jan 2010 15:12:53 +0100 |
parents | a3d73b3e1f8a |
children | 6227c8d669d5 |
line wrap: on
line source
updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved updating to branch default 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 --update should ignore --update pulling from searching for changes no changes found % 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 |