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-merge7.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 13 Mar 2006 08:56:59 +0100
changeset 1922 6d50d6189269
parent 1352 bf6c91cb816f
child 1933 7544700fd931
permissions -rw-r--r--
ui: output the number of file updated/merged/removed/... on update add a note for people to remember commiting after a merge.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset 
     1
 
pulling from ../test-a
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     2
 
searching for changes
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     3
 
adding changesets
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     4
 
adding manifests
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     5
 
adding file changes
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     6
 
added 1 changesets with 1 changes to 1 files (+1 heads)
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     7
 
(run 'hg update' to get a working copy)
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     8
 
merge: warning: conflicts during merge
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     9
 
merging test.txt
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    10
 
merging test.txt failed!
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset 
    11
 
pulling from ../test-a
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    12
 
searching for changes
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    13
 
adding changesets
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    14
 
adding manifests
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    15
 
adding file changes
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    16
 
added 1 changesets with 1 changes to 1 files (+1 heads)
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    17
 
(run 'hg update' to get a working copy)
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    18
 
merge: warning: conflicts during merge
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    19
 
resolving manifests
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    20
 
 force None allow 1 moddirstate True linear False
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    21
 
 ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    22
 
 test.txt versions differ, resolve
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    23
 
merging test.txt
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    24
 
resolving test.txt
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    25
 
file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    26
 
merging test.txt failed!
1922
6d50d6189269 ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1352
diff changeset 
    27
 
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
6d50d6189269 ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1352
diff changeset 
    28
 
(branch merge, don't forget to commit)
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    29
 
one
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset 
    30
 
<<<<<<<
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    31
 
two-point-five
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    32
 
=======
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    33
 
two-point-one
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset 
    34
 
>>>>>>>
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    35
 
three
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    36
 
   rev    offset  length   base linkrev nodeid       p1           p2
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    37
 
     0         0       7      0       0 01365c4cca56 000000000000 000000000000
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    38
 
     1         7       9      1       1 7b013192566a 01365c4cca56 000000000000
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    39
 
     2        16      15      2       2 8fe46a3eb557 01365c4cca56 000000000000
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    40
 
     3        31      27      2       3 fc3148072371 7b013192566a 8fe46a3eb557
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    41
 
     4        58      25      4       4 d40249267ae3 8fe46a3eb557 000000000000
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset 
    42
 
changeset:   4:40d11a4173a8
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    43
 
tag:         tip
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    44
 
parent:      2:96b70246a118
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    45
 
user:        test
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset 
    46
 
date:        Thu Jan  1 00:00:00 1970 +0000
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    47
 
summary:     two -> two-point-one
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    48
 












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    49


changeset:   3:50c3a7e29886












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    50


parent:      1:d1e159716d41












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    51


parent:      2:96b70246a118












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    52


user:        test












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    53


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












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    54


summary:     Merge 1












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    55














0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    56


changeset:   2:96b70246a118












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    57


parent:      0:b1832b9d912a












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    58


user:        test












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    59


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












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    60


summary:     Numbers as words












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    61














0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    62


changeset:   1:d1e159716d41












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    63


user:        test












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    64


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












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    65


summary:     2 -> 2.5












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    66














0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    67


changeset:   0:b1832b9d912a












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    68


user:        test












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    69


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












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    70


summary:     Initial












0e2be889ccd7
Repair ancestor logic, fix up test cases



Matt Mackall <mpm@selenic.com>


parents: 

diff
changeset




    71
















mercurial