Mercurial > hg
view tests/test-rebase-pull.out @ 9761:647f8c857810
i18n-pt_BR: translate 'changeset' like 'revision'
On Mercurial, 'changeset' and 'revision' may be used
interchangeably, but the first is more or less
untranslatable to a single word.
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Tue, 20 Oct 2009 15:26:22 -0200 |
parents | dd1b47e17d7e |
children | a3d73b3e1f8a |
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 --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 |