Show More
@@ -54,6 +54,12 b' Rebasing descendant onto ancestor across' | |||||
54 | |/ |
|
54 | |/ | |
55 | o 0: 'A' |
|
55 | o 0: 'A' | |
56 |
|
56 | |||
|
57 | ||||
|
58 | ||||
|
59 | $ hg rebase -s 7 -d 8 | |||
|
60 | abort: source is ancestor of destination | |||
|
61 | [255] | |||
|
62 | ||||
57 | $ hg rebase -s 8 -d 7 |
|
63 | $ hg rebase -s 8 -d 7 | |
58 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
64 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | |
59 |
|
65 | |||
@@ -114,44 +120,3 b' Rebasing descendant onto ancestor across' | |||||
114 |
|
120 | |||
115 | $ cd .. |
|
121 | $ cd .. | |
116 |
|
122 | |||
117 | Rebasing ancestor onto descendant across different named branches |
|
|||
118 |
|
||||
119 | $ hg clone -q -u . a a3 |
|
|||
120 |
|
||||
121 | $ cd a3 |
|
|||
122 |
|
||||
123 | $ hg branch dev |
|
|||
124 | marked working directory as branch dev |
|
|||
125 |
|
||||
126 | $ echo x > x |
|
|||
127 |
|
||||
128 | $ hg add x |
|
|||
129 |
|
||||
130 | $ hg ci -m 'extra named branch' |
|
|||
131 |
|
||||
132 | $ hg tglog |
|
|||
133 | @ 8: 'extra named branch' dev |
|
|||
134 | | |
|
|||
135 | o 7: 'H' |
|
|||
136 | | |
|
|||
137 | | o 6: 'G' |
|
|||
138 | |/| |
|
|||
139 | o | 5: 'F' |
|
|||
140 | | | |
|
|||
141 | | o 4: 'E' |
|
|||
142 | |/ |
|
|||
143 | | o 3: 'D' |
|
|||
144 | | | |
|
|||
145 | | o 2: 'C' |
|
|||
146 | | | |
|
|||
147 | | o 1: 'B' |
|
|||
148 | |/ |
|
|||
149 | o 0: 'A' |
|
|||
150 |
|
||||
151 | $ hg rebase -s 7 -d 8 |
|
|||
152 | abort: source is ancestor of destination |
|
|||
153 | [255] |
|
|||
154 |
|
||||
155 | $ cd .. |
|
|||
156 |
|
||||
157 |
|
General Comments 0
You need to be logged in to leave comments.
Login now