##// END OF EJS Templates
make commit fail when committing unresolved files
make commit fail when committing unresolved files

File last commit:

r6338:0750f111 default
r6888:7c36a4fb default
Show More
test-rename-after-merge.out
23 lines | 578 B | text/plain | TextLexer
/ tests / test-rename-after-merge.out
% create source repository
adding a
% fork source repository
updating working directory
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)
M b
% rename b as c
A c
R b
% rename back c as b
M b