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

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

dirstate: don't walk ignored directories...
dirstate: don't walk ignored directories With a pattern like '^directory$' in .hgignore, a "hg status directory" would still walk "directory" and all its subdirs. This is the first half of a fix for issue886.
Matt Mackall - - Load All Authors

File last commit:

r5608:784eadab default
r6032:b41f0d6a default
Show More
test-rename-after-merge.out
20 lines | 543 B | text/plain | TextLexer
/ tests / test-rename-after-merge.out
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
 r5318 % 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