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-empty-group.out
author Matt Mackall <mpm@selenic.com>
Wed, 28 Apr 2010 13:45:21 -0500
branchstable
changeset 11031 409c0e4d79e9
parent 9611 a3d73b3e1f8a
child 12156 4c94b6d0fb1c
permissions -rw-r--r--
Merge with i18n
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2339
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     1
 
adding init
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     2
 
adding x
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     3
 
adding y
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     4
 
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     5
 
adding x
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     6
 
adding y
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4162
diff changeset 
     7
 
created new head
2339
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     8
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     9
 
(branch merge, don't forget to commit)
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    10
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    11
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    12
 
(branch merge, don't forget to commit)
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4162
diff changeset 
    13
 
created new head
2339
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    14
 
requesting all changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    15
 
adding changesets
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    16
 
adding manifests
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    17
 
adding file changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    18
 
added 4 changesets with 3 changes to 3 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset 
    19
 
updating to branch default
2339
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    20
 
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    21
 
requesting all changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    22
 
adding changesets
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    23
 
adding manifests
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    24
 
adding file changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    25
 
added 4 changesets with 3 changes to 3 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset 
    26
 
updating to branch default
2339
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    27
 
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
4162
b2d9e553cdc8 incoming/outgoing: print the name of the other repo
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2339
diff changeset 
    28
 
comparing with b
2339
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    29
 
searching for changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    30
 
changeset:   4:fdb3c546e859
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    31
 
tag:         tip
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    32
 
parent:      1:1f703b3fcbc6
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    33
 
parent:      2:de997049e034
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    34
 
user:        test
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    35
 
date:        Mon Jan 12 13:46:40 1970 +0000
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    36
 
summary:     m2
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    37
 







4162






b2d9e553cdc8
incoming/outgoing: print the name of the other repo



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


parents: 
2339

diff
changeset




    38


comparing with c








2339






11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    39


searching for changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    40


changeset:   3:f40f830c0024













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    41


parent:      2:de997049e034













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    42


parent:      1:1f703b3fcbc6













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    43


user:        test













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    44


date:        Mon Jan 12 13:46:40 1970 +0000













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    45


summary:     m1













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    46









4162






b2d9e553cdc8
incoming/outgoing: print the name of the other repo



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


parents: 
2339

diff
changeset




    47


comparing with c








2339






11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    48


searching for changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    49


changeset:   3:f40f830c0024













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    50


tag:         tip













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    51


parent:      2:de997049e034













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    52


parent:      1:1f703b3fcbc6













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    53


user:        test













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    54


date:        Mon Jan 12 13:46:40 1970 +0000













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    55


summary:     m1













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    56









4162






b2d9e553cdc8
incoming/outgoing: print the name of the other repo



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


parents: 
2339

diff
changeset




    57


comparing with b








2339






11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    58


searching for changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    59


changeset:   3:fdb3c546e859













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    60


tag:         tip













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    61


parent:      1:1f703b3fcbc6













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    62


parent:      2:de997049e034













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    63


user:        test













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    64


date:        Mon Jan 12 13:46:40 1970 +0000













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    65


summary:     m2













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    66














11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    67


pulling from a













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    68


searching for changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    69


adding changesets













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    70


adding manifests













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    71


adding file changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    72


added 1 changesets with 0 changes to 0 files (+1 heads)













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    73


(run 'hg heads' to see heads, 'hg merge' to merge)













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    74


pulling from a













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    75


searching for changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    76


adding changesets













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    77


adding manifests













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    78


adding file changes













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    79


added 1 changesets with 0 changes to 0 files (+1 heads)













11422943cf72
document and fix findincoming



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




    80


(run 'hg heads' to see heads, 'hg merge' to merge)















Mercurial