tests/test-rebase-scenario-global.out
branchstable
changeset 12795 3cb0559e44d0
parent 12793 469850088fc1
parent 12794 6bf8d48bec8e
child 12796 bc69ba99e34b
equal deleted inserted replaced
12793:469850088fc1 12795:3cb0559e44d0
     1 @  5: F
       
     2 |
       
     3 | o  4: E
       
     4 |/|
       
     5 o |  3: D
       
     6 | |
       
     7 | o  2: C
       
     8 |/
       
     9 | o  1: B
       
    10 |/
       
    11 o  0: A
       
    12 
       
    13 % Rebasing
       
    14 % B onto F - simple rebase
       
    15 saved backup bundle to 
       
    16 @  5: B
       
    17 |
       
    18 o  4: F
       
    19 |
       
    20 | o  3: E
       
    21 |/|
       
    22 o |  2: D
       
    23 | |
       
    24 | o  1: C
       
    25 |/
       
    26 o  0: A
       
    27 
       
    28 % B onto D - intermediate point
       
    29 saved backup bundle to 
       
    30 @  5: B
       
    31 |
       
    32 | o  4: F
       
    33 |/
       
    34 | o  3: E
       
    35 |/|
       
    36 o |  2: D
       
    37 | |
       
    38 | o  1: C
       
    39 |/
       
    40 o  0: A
       
    41 
       
    42 % C onto F - skip of E
       
    43 saved backup bundle to 
       
    44 @  4: C
       
    45 |
       
    46 o  3: F
       
    47 |
       
    48 o  2: D
       
    49 |
       
    50 | o  1: B
       
    51 |/
       
    52 o  0: A
       
    53 
       
    54 % D onto C - rebase of a branching point (skip E)
       
    55 saved backup bundle to 
       
    56 @  4: F
       
    57 |
       
    58 o  3: D
       
    59 |
       
    60 o  2: C
       
    61 |
       
    62 | o  1: B
       
    63 |/
       
    64 o  0: A
       
    65 
       
    66 % E onto F - merged revision having a parent in ancestors of target
       
    67 saved backup bundle to 
       
    68 @    5: E
       
    69 |\
       
    70 | o  4: F
       
    71 | |
       
    72 | o  3: D
       
    73 | |
       
    74 o |  2: C
       
    75 |/
       
    76 | o  1: B
       
    77 |/
       
    78 o  0: A
       
    79 
       
    80 % D onto B - E maintains C as parent
       
    81 saved backup bundle to 
       
    82 @  5: F
       
    83 |
       
    84 | o  4: E
       
    85 |/|
       
    86 o |  3: D
       
    87 | |
       
    88 | o  2: C
       
    89 | |
       
    90 o |  1: B
       
    91 |/
       
    92 o  0: A
       
    93 
       
    94 % These will fail (using --source)
       
    95 % E onto D - rebase onto an ancestor
       
    96 abort: source is descendant of destination
       
    97 % D onto E - rebase onto a descendant
       
    98 abort: source is ancestor of destination
       
    99 % E onto B - merge revision with both parents not in ancestors of target
       
   100 abort: cannot use revision 4 as base, result would have 3 parents
       
   101 
       
   102 % These will abort gracefully (using --base)
       
   103 % E onto E - rebase onto same changeset
       
   104 nothing to rebase
       
   105 % E onto D - rebase onto an ancestor
       
   106 nothing to rebase
       
   107 % D onto E - rebase onto a descendant
       
   108 nothing to rebase