sapling/tests/test-rebase-pull.out
Matt Mackall 46429c0cb8 strip: hide unbundle messages by default
Unbundling is an internal implementation detail for strip, only show
them with --verbose.
2010-05-20 13:27:28 -05:00

53 lines
1.1 KiB
Plaintext

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)
saved backup bundle to
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
nothing to rebase
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ 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
|