Mercurial Mercurial > hg-stable / 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.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 15 Jun 2009 00:03:26 +0200
changeset 8810 ac92775b3b80
parent 6405 b8346ae5d64b
child 10358 d42821cd5c96
permissions -rw-r--r--
Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result.
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
 
changeset:   2:effea6de0384
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
tag:         tip
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     3
 
parent:      0:bbd179dfa0a7
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 
user:        test
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     5
 
date:        Thu Jan 01 00:00:00 1970 +0000
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     6
 
summary:     add bar
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     7
 












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



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


parents: 

diff
changeset




     8


changeset:   1:ed1b79f46b9a













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



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


parents: 

diff
changeset




     9


user:        test













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



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


parents: 

diff
changeset




    10


date:        Thu Jan 01 00:00:00 1970 +0000













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



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


parents: 

diff
changeset




    11


summary:     change foo













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



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


parents: 

diff
changeset




    12














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



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


parents: 

diff
changeset




    13


changeset:   0:bbd179dfa0a7













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



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


parents: 

diff
changeset




    14


user:        test













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



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


parents: 

diff
changeset




    15


date:        Thu Jan 01 00:00:00 1970 +0000













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



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


parents: 

diff
changeset




    16


summary:     add foo













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



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


parents: 

diff
changeset




    17









6405






b8346ae5d64b
commands: fix shadowed repo module



Patrick Mezard <pmezard@gmail.com>


parents: 
5221

diff
changeset




    18


% pull a missing revision













b8346ae5d64b
commands: fix shadowed repo module



Patrick Mezard <pmezard@gmail.com>


parents: 
5221

diff
changeset




    19


abort: unknown revision 'missing'!








5221






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



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


parents: 

diff
changeset




    20


% 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




    21


changeset:   0:bbd179dfa0a7













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



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


parents: 

diff
changeset




    22


tag:         tip













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



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


parents: 

diff
changeset




    23


user:        test













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



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


parents: 

diff
changeset




    24


date:        Thu Jan 01 00:00:00 1970 +0000













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



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


parents: 

diff
changeset




    25


summary:     add foo













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



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


parents: 

diff
changeset




    26














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



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


parents: 

diff
changeset




    27


% 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




    28


changeset:   1:ed1b79f46b9a













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



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


parents: 

diff
changeset




    29


tag:         tip













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



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


parents: 

diff
changeset




    30


user:        test













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



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


parents: 

diff
changeset




    31


date:        Thu Jan 01 00:00:00 1970 +0000













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



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


parents: 

diff
changeset




    32


summary:     change foo













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



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


parents: 

diff
changeset




    33














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



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


parents: 

diff
changeset




    34


changeset:   0:bbd179dfa0a7













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



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


parents: 

diff
changeset




    35


user:        test













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



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


parents: 

diff
changeset




    36


date:        Thu Jan 01 00:00:00 1970 +0000













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



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


parents: 

diff
changeset




    37


summary:     add foo













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



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


parents: 

diff
changeset




    38














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



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


parents: 

diff
changeset




    39


% pull -r 1 again















hg-stable