Show More
@@ -1123,6 +1123,23 b' consequence f (descendant of d) is left ' | |||||
1123 | o 0:b173517d0057 a |
|
1123 | o 0:b173517d0057 a | |
1124 |
|
1124 | |||
1125 | $ hg strip -r 8: |
|
1125 | $ hg strip -r 8: | |
|
1126 | $ hg log -G -r 'a':: | |||
|
1127 | * 7:1143e9adc121 f | |||
|
1128 | | | |||
|
1129 | | o 6:d60ebfa0f1cb e | |||
|
1130 | | | | |||
|
1131 | | o 5:027ad6c5830d d' | |||
|
1132 | | | | |||
|
1133 | x | 4:76be324c128b d (rewritten using replace as 5:027ad6c5830d) | |||
|
1134 | |/ | |||
|
1135 | o 3:a82ac2b38757 c | |||
|
1136 | | | |||
|
1137 | | o 2:630d7c95eff7 x | |||
|
1138 | | | | |||
|
1139 | o | 1:488e1b7e7341 b | |||
|
1140 | |/ | |||
|
1141 | o 0:b173517d0057 a | |||
|
1142 | ||||
1126 |
|
1143 | |||
1127 |
|
|
1144 | If the rebase set has an obsolete (d) with a successor (d') outside the rebase | |
1128 | set and none in destination, we still get the divergence warning. |
|
1145 | set and none in destination, we still get the divergence warning. |
General Comments 0
You need to be logged in to leave comments.
Login now