Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-586
author Brendan Cully <brendan@kublai.com>
Wed, 15 Aug 2007 14:38:18 -0700
changeset 5173 7e05bdeee7de
parent 4536 720ae5085ee3
permissions -rwxr-xr-x
convert: raise Abort instead of NoRepo when CVS pserver auth fails. At this point we know the source is CVS, so we should not go through the rest of the converters.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4536
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     1
 
#!/bin/sh
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     2
 
# a test for issue586
720ae5085ee3 commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     3
 












720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




     4


hg init a













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




     5


cd a













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




     6


echo a > a













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




     7


hg ci -Ama













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




     8














720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




     9


hg init ../b













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    10


cd ../b













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    11


echo b > b













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    12


hg ci -Amb













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    13














720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    14


hg pull -f ../a













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    15


hg merge













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    16


hg rm -f a













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    17


hg ci -Amc













720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    18














720ae5085ee3
commit: fix bug where dirstate for removed file is confused



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    19


hg st -A















mercurial-crew-with-dirclash