tests/test-clone-update-order.out
branchstable
changeset 12795 3cb0559e44d0
parent 12793 469850088fc1
parent 12794 6bf8d48bec8e
child 12796 bc69ba99e34b
equal deleted inserted replaced
12793:469850088fc1 12795:3cb0559e44d0
     1 
       
     2 % prepare repo a
       
     3 adding bar
       
     4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
     5 marked working directory as branch mine
       
     6 adding world
       
     7 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
     8 marked working directory as branch other
       
     9 adding bye
       
    10 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
    11 % test -U -u
       
    12 abort: cannot specify both --noupdate and --updaterev
       
    13 % test -U
       
    14 requesting all changes
       
    15 adding changesets
       
    16 adding manifests
       
    17 adding file changes
       
    18 added 3 changesets with 3 changes to 3 files (+2 heads)
       
    19 % test -u .
       
    20 requesting all changes
       
    21 adding changesets
       
    22 adding manifests
       
    23 adding file changes
       
    24 added 3 changesets with 3 changes to 3 files (+2 heads)
       
    25 updating to branch mine
       
    26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    27 % test -u 0
       
    28 requesting all changes
       
    29 adding changesets
       
    30 adding manifests
       
    31 adding file changes
       
    32 added 3 changesets with 3 changes to 3 files (+2 heads)
       
    33 updating to branch default
       
    34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    35 % test -u 1
       
    36 requesting all changes
       
    37 adding changesets
       
    38 adding manifests
       
    39 adding file changes
       
    40 added 3 changesets with 3 changes to 3 files (+2 heads)
       
    41 updating to branch mine
       
    42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    43 % test -u 2
       
    44 requesting all changes
       
    45 adding changesets
       
    46 adding manifests
       
    47 adding file changes
       
    48 added 3 changesets with 3 changes to 3 files (+2 heads)
       
    49 updating to branch other
       
    50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    51 % test -r 0
       
    52 requesting all changes
       
    53 adding changesets
       
    54 adding manifests
       
    55 adding file changes
       
    56 added 3 changesets with 3 changes to 3 files (+2 heads)
       
    57 updating to branch other
       
    58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    59 % test -r mine ... mine is ignored
       
    60 requesting all changes
       
    61 adding changesets
       
    62 adding manifests
       
    63 adding file changes
       
    64 added 3 changesets with 3 changes to 3 files (+2 heads)
       
    65 updating to branch other
       
    66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    67 % test -b default
       
    68 requesting all changes
       
    69 adding changesets
       
    70 adding manifests
       
    71 adding file changes
       
    72 added 3 changesets with 3 changes to 3 files (+2 heads)
       
    73 updating to branch default
       
    74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    75 % test
       
    76 requesting all changes
       
    77 adding changesets
       
    78 adding manifests
       
    79 adding file changes
       
    80 added 1 changesets with 1 changes to 1 files
       
    81 updating to branch other
       
    82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    83 % test tip
       
    84 updating to branch other
       
    85 1 files updated, 0 files merged, 0 files removed, 0 files unresolved