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

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

make path expanding more consistent...
make path expanding more consistent This expands ~user and $FOO constructs in ui.ignore files, [defaults], [paths], extension paths, and HGRCPATH files.
Martijn Pieters - - Load All Authors

File last commit:

r8241:dd1b47e1 default
r9610:d78fe60f default
Show More
test-rebase-pull.out
58 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-rebase-pull.out
History | Annotation | Raw |Copy content |Copy permalink
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
|