Mercurial Mercurial > hg / 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-merge3
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Tue, 18 Dec 2007 14:11:13 -0600
changeset 5664 da72b4d24797
parent 1933 7544700fd931
child 11177 6a64813276ed
permissions -rwxr-xr-x
Fix income/pull with bundle and -R (issue 820). Uses ui.setconfig() to tell bundlerepo where the main repo is. This is needed for when the --repository option is used. Adds tests to test-bundle and a new test script test-mq-pull-from-bundle, which plays out the situation that initially made me detect this bug (hg -R .hg/patches pull ../bundle.hg).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
800
ec85f9e6f3b1 Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     1
 
#!/bin/sh
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset 
     2
 












2fe8d66e3075
[PATCH] (3/4) Removing an added file



mpm@selenic.com


parents: 

diff
changeset




     3


hg init













2fe8d66e3075
[PATCH] (3/4) Removing an added file



mpm@selenic.com


parents: 

diff
changeset




     4


echo This is file a1 > a













2fe8d66e3075
[PATCH] (3/4) Removing an added file



mpm@selenic.com


parents: 

diff
changeset




     5


hg add a








1933






7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
814

diff
changeset




     6


hg commit -m "commit #0" -d "1000000 0"








402






2fe8d66e3075
[PATCH] (3/4) Removing an added file



mpm@selenic.com


parents: 

diff
changeset




     7


touch b













2fe8d66e3075
[PATCH] (3/4) Removing an added file



mpm@selenic.com


parents: 

diff
changeset




     8


hg add b













2fe8d66e3075
[PATCH] (3/4) Removing an added file



mpm@selenic.com


parents: 

diff
changeset




     9


rm b








1933






7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
814

diff
changeset




    10


hg commit -A -m"comment #1" -d "1000000 0"















Mercurial