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

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

add -r/--rev and --base option to bundle...
add -r/--rev and --base option to bundle --rev is used to specify a target rev (like pull or clone) --base REV is used to specify a base instead of a target repo the target repo is assumed to have all the rev specified in --base
Matt Mackall - - Load All Authors

File last commit:

r3252:ae85272b default
r3284:d89e9884 default
Show More
test-rename-merge1.out
22 lines | 532 B | text/plain | TextLexer
/ tests / test-rename-merge1.out
History | Annotation | Raw |Copy content |Copy permalink
checkout
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
merge
resolving manifests
overwrite None branchmerge True partial False
ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
a: remote moved -> c
b2: remote created -> g
merging a and b to b
resolving a
my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c
copying a to b
removing a
getting b2
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M b
a
M b2
R a
C c2
blahblah