Mercurial Mercurial > mercurial / 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>
Mon, 24 Jul 2006 17:06:39 -0500
changeset 2658 2be3001847cb
parent 2339 11422943cf72
child 4162 b2d9e553cdc8
permissions -rw-r--r--
Merge with crew
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
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     7
 
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 
     8
 
(branch merge, don't forget to commit)
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     9
 
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 
    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
 
(branch merge, don't forget to commit)
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    12
 
requesting all changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    13
 
adding changesets
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    14
 
adding manifests
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    15
 
adding file changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    16
 
added 4 changesets with 3 changes to 3 files
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    17
 
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 
    18
 
requesting all changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    19
 
adding changesets
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    20
 
adding manifests
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    21
 
adding file changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    22
 
added 4 changesets with 3 changes to 3 files
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    23
 
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 
    24
 
searching for changes
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    25
 
changeset:   4:fdb3c546e859
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    26
 
tag:         tip
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    27
 
parent:      1:1f703b3fcbc6
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    28
 
parent:      2:de997049e034
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    29
 
user:        test
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    30
 
date:        Mon Jan 12 13:46:40 1970 +0000
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    31
 
summary:     m2
11422943cf72 document and fix findincoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
    32
 












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    33


searching for changes












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    34


changeset:   3:f40f830c0024












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    35


parent:      2:de997049e034












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    36


parent:      1:1f703b3fcbc6












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    37


user:        test












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    38


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












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    39


summary:     m1












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    40














11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    41


searching for changes












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    42


changeset:   3:f40f830c0024












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    43


tag:         tip












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    44


parent:      2:de997049e034












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    45


parent:      1:1f703b3fcbc6












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    46


user:        test












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    47


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












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    48


summary:     m1












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    49














11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    50


searching for changes












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    51


changeset:   3:fdb3c546e859












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    52


tag:         tip












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    53


parent:      1:1f703b3fcbc6












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    54


parent:      2:de997049e034












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    55


user:        test












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    56


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












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    57


summary:     m2












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    58














11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    59


pulling from a












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    60


searching for changes












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    61


adding changesets












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    62


adding manifests












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    63


adding file changes












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    64


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




    65


(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




    66


pulling from a












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    67


searching for changes












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    68


adding changesets












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    69


adding manifests












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    70


adding file changes












11422943cf72
document and fix findincoming



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


parents: 

diff
changeset




    71


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




    72


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














mercurial