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-pull-r
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 21 Feb 2008 16:22:31 -0300
changeset 6158 23ffe82615d8
parent 5221 8ede77c2d008
child 6405 b8346ae5d64b
permissions -rwxr-xr-x
repo.status: also compare flags for files in the lookup list. We might be able to do something smarter about this in dirstate.status for files in normallookup state, but that would require some extra care to keep backwards compatibility.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5221
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
#!/bin/sh
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 












8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     3


hg init repo













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     4


cd repo













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     5


echo foo > foo













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     6


hg ci -qAm 'add foo' -d '0 0'













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     7


echo >> foo













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     8


hg ci -m 'change foo' -d '0 0'













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     9


hg up -qC 0













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    10


echo bar > bar













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    11


hg ci -qAm 'add bar' -d '0 0'













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    12


hg log













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    13


cd ..













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    14


hg init copy













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    15


cd copy













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    16














8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    17


echo '% pull -r 0'













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    18


hg pull -qr 0 ../repo













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    19


hg log













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    20














8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    21


echo '% pull -r 1'













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    22


hg pull -qr 1 ../repo













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    23


hg log













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    24














8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    25


# this used to abort: received changelog group is empty













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    26


echo '% pull -r 1 again'













8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    27


hg pull -qr 1 ../repo















Mercurial