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 Peter Meerwald <pmeerw@pmeerw.net>
Fri, 17 Aug 2007 22:43:38 -0300
changeset 5193 942c0827dc5b
parent 4536 720ae5085ee3
permissions -rwxr-xr-x
recognize user:password in URLs that include port numbers. when giving user/pwd in an URL, eg. hg pull http://user:pwd@host.com:666/hg/something, hg would still ask for user/pwd in interactive mode (or fail in non-interactive)
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