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 Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 26 Sep 2007 01:58:45 -0300
changeset 5338 f87685355c9c
parent 2976 61fcd9fac434
permissions -rwxr-xr-x
revlog: fix revlogio.packentry corner case We want to store version information about the revlog in the first entry of its index. The code in packentry was using some heuristics to detect whether this was the first entry, but these heuristics could fail in some cases (e.g. rev 0 was empty; rev 1 descends directly from the nullid and is stored as a delta). We now give the revision number to packentry to avoid heuristics.
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