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-pull-r.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 04 Oct 2007 23:21:37 -0300
changeset 5378 8a2915f57dfc
parent 5235 8ede77c2d008
permissions -rw-r--r--
convert: add a mode where mercurial_sink skips empty revisions. The getchanges function of some converter_source classes can return some false positives. I.e. they sometimes claim that a file "foo" was changed in some revision, even though its contents are still the same. convert_svn is particularly bad, but I think this can also happen with convert_cvs and, at least in theory, with mercurial_source. For regular conversions this is not really a problem - as long as getfile returns the right contents, we'll get a converted revision with the right contents. But when we use --filemap, this could lead to superfluous revisions being converted. Instead of fixing every converter_source, I decided to change mercurial_sink to work around this problem. When --filemap is used, we're interested only in revisions that touch some specific files. If a revision doesn't change any of these files, then we're not interested in it (at least for revisions with a single parent; merges are special). For mercurial_sink, we abuse this property and rollback a commit if the manifest text hasn't changed. This avoids duplicating the logic from localrepo.filecommit to detect unchanged files.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5235
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














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



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


parents: 

diff
changeset




    18


% 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




    19


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




    20


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




    21


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




    22


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




    23


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




    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


% 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




    26


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




    27


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




    28


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




    29


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




    30


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




    31














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



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


parents: 

diff
changeset




    32


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




    33


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




    34


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




    35


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




    36














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



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


parents: 

diff
changeset




    37


% pull -r 1 again















mercurial-crew-with-dirclash