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

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

cmdutil: always expose "files_add", "files_del" and "manifest" templater properties
cmdutil: always expose "files_add", "files_del" and "manifest" templater properties
Patrick Mezard - - Load All Authors

File last commit:

r5318:c6682cda default
r5545:5a124ce4 default
Show More
test-rename-after-merge.out
20 lines | 543 B | text/plain | TextLexer
/ tests / test-rename-after-merge.out
History | Annotation | Raw |Copy content |Copy permalink
% create source repository
adding a
% fork source repository
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
% update source repository
% merge repositories
pulling from ../t2
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)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% rename b as c
A c
R b
% rename back c as b