tests/test-merge-remove.out
author James Abbatiello <abbeyj at gmail.com>
Tue, 14 Jul 2009 22:42:05 -0400
changeset 9129 395b0e132836
parent 6736 369ddc9c0339
permissions -rw-r--r--
Don't copy hidden files/directories during `setup.py install` This is useful if a copy of Mercurial is stored in a Subversion repository so that the .svn directories don't get copied.

created new head
merging foo1 and foo to foo1
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
% removing foo1 and bar
r   0         -2 bar
r   0         -1 foo1
copy: foo -> foo1
R bar
R foo1
% readding foo1 and bar
adding bar
adding foo1
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
  foo
% reverting foo1 and bar
saving current version of bar as bar.orig
reverting bar
saving current version of foo1 as foo1.orig
reverting foo1
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
  foo