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

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

templatekw: change {file_copies} behaviour, add {file_copies_switch}...
templatekw: change {file_copies} behaviour, add {file_copies_switch} {file_copies} template now displays file copies with or without the --copies switch being set. A new {file_copies_switch} template implements the former behaviour.
Adrian Buehlmann - - Load All Authors

File last commit:

r9611:a3d73b3e default
r10060:f780b109 default
Show More
test-rebase-pull.out
58 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-rebase-pull.out
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Stefano Tortarolo
rebase: pull --rebase updates if there is nothing to rebase
 r7786 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Stefano Tortarolo
Add rebase extension
 r6906 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
|
Martijn Pieters
Fix typeerror when specifying both --rebase and --pull
 r8241 % pull --rebase --update should ignore --update
pulling from
searching for changes
no changes found
Stefano Tortarolo
rebase: pull --rebase updates if there is nothing to rebase
 r7786 % 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
|