tests/test-clone-update-order.t
changeset 34661 eb586ed5d8ce
parent 25295 701df761aa94
child 45827 8d72e29ad1e0
equal deleted inserted replaced
34660:d00ec62d156f 34661:eb586ed5d8ce
    27   $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
    27   $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
    28   adding changesets
    28   adding changesets
    29   adding manifests
    29   adding manifests
    30   adding file changes
    30   adding file changes
    31   added 3 changesets with 3 changes to 3 files (+2 heads)
    31   added 3 changesets with 3 changes to 3 files (+2 heads)
       
    32   new changesets 8c68ee086fd0:fcc393352796
    32   $ rm -rf ../b
    33   $ rm -rf ../b
    33 
    34 
    34   $ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other
    35   $ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other
    35   adding changesets
    36   adding changesets
    36   adding manifests
    37   adding manifests
    37   adding file changes
    38   adding file changes
    38   added 3 changesets with 3 changes to 3 files (+2 heads)
    39   added 3 changesets with 3 changes to 3 files (+2 heads)
       
    40   new changesets 8c68ee086fd0:fcc393352796
    39   updating to branch mine
    41   updating to branch mine
    40   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    42   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    41   $ rm -rf ../b
    43   $ rm -rf ../b
    42 
    44 
    43   $ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other
    45   $ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other
    44   adding changesets
    46   adding changesets
    45   adding manifests
    47   adding manifests
    46   adding file changes
    48   adding file changes
    47   added 3 changesets with 3 changes to 3 files (+2 heads)
    49   added 3 changesets with 3 changes to 3 files (+2 heads)
       
    50   new changesets 8c68ee086fd0:fcc393352796
    48   updating to branch default
    51   updating to branch default
    49   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    52   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    50   $ rm -rf ../b
    53   $ rm -rf ../b
    51 
    54 
    52   $ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other
    55   $ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other
    53   adding changesets
    56   adding changesets
    54   adding manifests
    57   adding manifests
    55   adding file changes
    58   adding file changes
    56   added 3 changesets with 3 changes to 3 files (+2 heads)
    59   added 3 changesets with 3 changes to 3 files (+2 heads)
       
    60   new changesets 8c68ee086fd0:fcc393352796
    57   updating to branch mine
    61   updating to branch mine
    58   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    62   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    59   $ rm -rf ../b
    63   $ rm -rf ../b
    60 
    64 
    61   $ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other
    65   $ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other
    62   adding changesets
    66   adding changesets
    63   adding manifests
    67   adding manifests
    64   adding file changes
    68   adding file changes
    65   added 3 changesets with 3 changes to 3 files (+2 heads)
    69   added 3 changesets with 3 changes to 3 files (+2 heads)
       
    70   new changesets 8c68ee086fd0:fcc393352796
    66   updating to branch other
    71   updating to branch other
    67   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    72   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    68   $ rm -rf ../b
    73   $ rm -rf ../b
    69 
    74 
    70 Test -r mine ... mine is ignored:
    75 Test -r mine ... mine is ignored:
    72   $ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other
    77   $ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other
    73   adding changesets
    78   adding changesets
    74   adding manifests
    79   adding manifests
    75   adding file changes
    80   adding file changes
    76   added 3 changesets with 3 changes to 3 files (+2 heads)
    81   added 3 changesets with 3 changes to 3 files (+2 heads)
       
    82   new changesets 8c68ee086fd0:fcc393352796
    77   updating to branch other
    83   updating to branch other
    78   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    84   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    79   $ rm -rf ../b
    85   $ rm -rf ../b
    80 
    86 
    81   $ hg clone .#other ../b -b default -b mine
    87   $ hg clone .#other ../b -b default -b mine
    82   adding changesets
    88   adding changesets
    83   adding manifests
    89   adding manifests
    84   adding file changes
    90   adding file changes
    85   added 3 changesets with 3 changes to 3 files (+2 heads)
    91   added 3 changesets with 3 changes to 3 files (+2 heads)
       
    92   new changesets 8c68ee086fd0:fcc393352796
    86   updating to branch default
    93   updating to branch default
    87   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    94   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    88   $ rm -rf ../b
    95   $ rm -rf ../b
    89 
    96 
    90   $ hg clone .#other ../b
    97   $ hg clone .#other ../b
    91   adding changesets
    98   adding changesets
    92   adding manifests
    99   adding manifests
    93   adding file changes
   100   adding file changes
    94   added 1 changesets with 1 changes to 1 files
   101   added 1 changesets with 1 changes to 1 files
       
   102   new changesets fcc393352796
    95   updating to branch other
   103   updating to branch other
    96   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   104   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    97   $ rm -rf ../b
   105   $ rm -rf ../b
    98 
   106 
    99   $ hg clone -U . ../c -r 1 -r 2 > /dev/null
   107   $ hg clone -U . ../c -r 1 -r 2 > /dev/null