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-mq-qdiff
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 29 Dec 2006 05:27:48 +0100
changeset 4012 d1e31d7f7d44
parent 2976 61fcd9fac434
permissions -rwxr-xr-x
fix handling of multiple Content-type headers This can happen if an error happens while sending application/mercurial-0.1 content. The error page will be sent resulting (for at least lighttpd) in the following headers: Content-type: application/mercurial-0.1 Content-type: text/html which result in req.proto = 'application/mercurial-0.1, text/html' fix issue344
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2904
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     1
 
#!/bin/sh
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     2
 







2976






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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2905

diff
changeset




     3


echo "[extensions]" >> $HGRCPATH













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



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2905

diff
changeset




     4


echo "mq=" >> $HGRCPATH








2904






8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




     5














8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




     6


echo % init













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




     7


hg init a













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




     8


cd a













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




     9














8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    10


echo % commit













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    11


echo 'base' > base













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    12


hg ci -Ambase -d '1 0'













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    13














8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    14


echo % qnew mqbase













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    15


hg qnew -mmqbase mqbase













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    16














8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    17


echo % qrefresh













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    18


echo 'patched' > base













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    19


hg qrefresh













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    20














8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    21


echo % qdiff













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    22


hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    23


               -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    24














8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    25


echo % qdiff dirname













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    26


hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \













8ca608c1eb02
tests: new test for mq qdiff command



Giorgos Keramidas <keramida@ceid.upatras.gr>


parents: 

diff
changeset




    27


                 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"















mercurial-crew-with-dirclash