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-mq-qsave
author Mads Kiilerich <mads@kiilerich.com>
Tue, 10 Feb 2009 22:47:38 +0100
changeset 7785 660c8dd44060
parent 2990 61fcd9fac434
permissions -rwxr-xr-x
test-merge-tool: Make sure no hgmerge can be found in $PATH The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH before it falls back to use internal merge. This fixes the test for this fallback to be tolerant to existing hgmerges.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2817
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     1
 
#!/bin/sh
ff3edd1c1e27 Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     2
 







2990






61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2820

diff
changeset




     3


echo "[extensions]" >> $HGRCPATH













61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2820

diff
changeset




     4


echo "mq=" >> $HGRCPATH








2817






ff3edd1c1e27
Add basic qsave/qrestore test.



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




     5














ff3edd1c1e27
Add basic qsave/qrestore test.



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




     6


hg init a













ff3edd1c1e27
Add basic qsave/qrestore test.



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




     7


cd a













ff3edd1c1e27
Add basic qsave/qrestore test.



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




     8














ff3edd1c1e27
Add basic qsave/qrestore test.



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




     9


echo 'base' > base













ff3edd1c1e27
Add basic qsave/qrestore test.



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    10


hg ci -Ambase -d '1 0'













ff3edd1c1e27
Add basic qsave/qrestore test.



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    11














ff3edd1c1e27
Add basic qsave/qrestore test.



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    12


hg qnew -mmqbase mqbase













ff3edd1c1e27
Add basic qsave/qrestore test.



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    13














ff3edd1c1e27
Add basic qsave/qrestore test.



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    14


hg qsave













ff3edd1c1e27
Add basic qsave/qrestore test.



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    15


hg qrestore 2















Mercurial