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-filebranch.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 15 Jun 2006 16:37:23 -0700
changeset 2439 e8c4f3d3df8c
parent 2175 b2ae81a7df29
child 2973 fb493241d7f6
permissions -rw-r--r--
extend network protocol to stop clients from locking servers now all repositories have capabilities slot, tuple with list of names. if 'unbundle' capability present, repo supports push where client does not need to lock server. repository classes that have unbundle capability also have unbundle method. implemented for ssh now, will be base for push over http. unbundle protocol acts this way. server tells client what heads it has during normal negotiate step. client starts unbundle by repeat server's heads back to it. if server has new heads, abort immediately. otherwise, transfer changes to server. once data transferred, server locks and checks heads again. if heads same, changes can be added. else someone else added heads, and server aborts. if client wants to force server to add heads, sends special heads list of 'force'.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
     1
 
creating base
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset 
     2
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
     3
 
creating branch a
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
     4
 
creating branch b
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
     5
 
we shouldn't have anything but n state here
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
     6
 
n 644          2 bar
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
     7
 
n 644          3 baz
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
     8
 
n 644          3 foo
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
     9
 
n 644          2 quux
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    10
 
merging
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    11
 
pulling from ../a
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    12
 
searching for changes
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    13
 
adding changesets
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    14
 
adding manifests
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    15
 
adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 993
diff changeset 
    16
 
added 1 changesets with 2 changes to 2 files (+1 heads)
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset 
    17
 
(run 'hg heads' to see heads, 'hg merge' to merge)
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    18
 
merging for foo
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    19
 
resolving manifests
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    20
 
getting bar
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    21
 
merging foo
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    22
 
resolving foo
1922
6d50d6189269 ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1043
diff changeset 
    23
 
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
6d50d6189269 ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1043
diff changeset 
    24
 
(branch merge, don't forget to commit)
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    25
 
we shouldn't have anything but foo in merge state here
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    26
 
m 644          3 foo
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    27
 
main: we should have a merge here
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset 
    28
 
   rev    offset  length   base linkrev nodeid       p1           p2
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset 
    29
 
     0         0      77      0       0 c36078bec30d 000000000000 000000000000
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset 
    30
 
     1        77      73      1       1 182b283965f1 c36078bec30d 000000000000
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset 
    31
 
     2       150      71      2       2 a6aef98656b7 c36078bec30d 000000000000
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset 
    32
 
     3       221      72      3       3 0c2cc6fc80e2 182b283965f1 a6aef98656b7
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset 
    33
 
log should show foo and quux changed
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset 
    34
 
changeset:   3:0c2cc6fc80e2d4ee289bb658dbbe9ad932380fe9
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset 
    35
 
tag:         tip
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset 
    36
 
parent:      1:182b283965f1069c0112784e30e7755ad1c0dd52
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset 
    37
 
parent:      2:a6aef98656b71154cae9d87408abe6d0218c8045
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset 
    38
 
user:        test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset 
    39
 
date:        Mon Jan 12 13:46:40 1970 +0000
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset 
    40
 
files:       foo quux
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset 
    41
 
description:
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset 
    42
 
merge
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset 
    43
 












6f274afc05c7
Clean up some merge logic



mpm@selenic.com


parents: 
990

diff
changeset




    44









990






5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    45


foo: we should have a merge here













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    46


   rev    offset  length   base linkrev nodeid       p1           p2













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    47


     0         0       3      0       0 b8e02f643373 000000000000 000000000000













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    48


     1         3       4      1       1 2ffeddde1b65 b8e02f643373 000000000000













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    49


     2         7       4      2       2 33d1fb69067a b8e02f643373 000000000000













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    50


     3        11       4      3       3 aa27919ee430 2ffeddde1b65 33d1fb69067a













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    51


bar: we shouldn't have a merge here













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    52


   rev    offset  length   base linkrev nodeid       p1           p2













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    53


     0         0       3      0       0 b8e02f643373 000000000000 000000000000













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    54


     1         3       4      1       2 33d1fb69067a b8e02f643373 000000000000













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    55


baz: we shouldn't have a merge here













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    56


   rev    offset  length   base linkrev nodeid       p1           p2













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    57


     0         0       3      0       0 b8e02f643373 000000000000 000000000000













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    58


     1         3       4      1       1 2ffeddde1b65 b8e02f643373 000000000000













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    59


quux: we shouldn't have a merge here













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    60


   rev    offset  length   base linkrev nodeid       p1           p2













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    61


     0         0       3      0       0 b8e02f643373 000000000000 000000000000













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    62


     1         3       5      1       3 6128c0f33108 b8e02f643373 000000000000








993






6f274afc05c7
Clean up some merge logic



mpm@selenic.com


parents: 
990

diff
changeset




    63


manifest entries should match tips of all files













6f274afc05c7
Clean up some merge logic



mpm@selenic.com


parents: 
990

diff
changeset




    64


33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar













6f274afc05c7
Clean up some merge logic



mpm@selenic.com


parents: 
990

diff
changeset




    65


2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz













6f274afc05c7
Clean up some merge logic



mpm@selenic.com


parents: 
990

diff
changeset




    66


aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo













6f274afc05c7
Clean up some merge logic



mpm@selenic.com


parents: 
990

diff
changeset




    67


6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux








990






5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    68


everything should be clean now













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    69


checking changesets













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    70


checking manifests













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    71


crosschecking files in changesets and manifests













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    72


checking files













5007e0bdeed2
Fix long-standing excessive file merges



mpm@selenic.com


parents: 

diff
changeset




    73


4 files, 4 changesets, 10 total revisions















mercurial-crew-with-dirclash