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-diffdir
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 29 Mar 2006 10:27:16 -0800
changeset 2019 ced2d3620f95
parent 1933 7544700fd931
child 3192 096f1c73cdc3
permissions -rwxr-xr-x
add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset 
     1
 
#!/bin/sh
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset 
     2
 












c15b4bc0a11c
Refactor diffrevs/diffdir into changes



mpm@selenic.com


parents: 

diff
changeset




     3


hg init













c15b4bc0a11c
Refactor diffrevs/diffdir into changes



mpm@selenic.com


parents: 

diff
changeset




     4


touch a













c15b4bc0a11c
Refactor diffrevs/diffdir into changes



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: 
1723

diff
changeset




     6


hg ci -m "a" -d "1000000 0"








536






c15b4bc0a11c
Refactor diffrevs/diffdir into changes



mpm@selenic.com


parents: 

diff
changeset




     7














c15b4bc0a11c
Refactor diffrevs/diffdir into changes



mpm@selenic.com


parents: 

diff
changeset




     8


echo 123 > b













c15b4bc0a11c
Refactor diffrevs/diffdir into changes



mpm@selenic.com


parents: 

diff
changeset




     9


hg add b








949






d997148155f2
test fixes for Solaris 2.6



TK Soh <teekaysoh@yahoo.com>


parents: 
814

diff
changeset




    10


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













d997148155f2
test fixes for Solaris 2.6



TK Soh <teekaysoh@yahoo.com>


parents: 
814

diff
changeset




    11


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








536






c15b4bc0a11c
Refactor diffrevs/diffdir into changes



mpm@selenic.com


parents: 

diff
changeset




    12









949






d997148155f2
test fixes for Solaris 2.6



TK Soh <teekaysoh@yahoo.com>


parents: 
814

diff
changeset




    13


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













d997148155f2
test fixes for Solaris 2.6



TK Soh <teekaysoh@yahoo.com>


parents: 
814

diff
changeset




    14


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








1723






fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
981

diff
changeset




    15














fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
981

diff
changeset




    16


echo foo > a













fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
981

diff
changeset




    17


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













fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
981

diff
changeset




    18


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















mercurial-crew-with-dirclash