##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: removed redundant "-d '0 0'" from test scripts...
tests: removed redundant "-d '0 0'" from test scripts The tests are executed with a .hgrc file which adds "-d '0 0'" by default.
Stefano Tortarolo - - Load All Authors

File last commit:

r7786:92455c1d default
r8167:6c82beaa default
Show More
test-rebase-pull.out
53 lines | 1.1 KiB | text/plain | TextLexer
/ tests / test-rebase-pull.out
History | Source | Raw |Copy content |Copy permalink
Stefano Tortarolo
rebase: pull --rebase updates if there is nothing to rebase
 r7786 updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Stefano Tortarolo
Add rebase extension
 r6906 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
Stefano Tortarolo
rebase: pull --rebase updates if there is nothing to rebase
 r7786 % 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
|