80 an ancestor of bookmark B, after moving B to B-NEW, the changes are ideally |
80 an ancestor of bookmark B, after moving B to B-NEW, the changes are ideally |
81 still introduced by an ancestor of changeset on B-NEW. In the below case, |
81 still introduced by an ancestor of changeset on B-NEW. In the below case, |
82 "BOOK-D", and "BOOK-E" include changes introduced by "C". |
82 "BOOK-D", and "BOOK-E" include changes introduced by "C". |
83 |
83 |
84 $ hg rebase -s 2 -d E |
84 $ hg rebase -s 2 -d E |
85 rebasing 2:dc0947a82db8 C BOOK-C "C" |
85 rebasing 2:dc0947a82db8 BOOK-C C "C" |
86 rebasing 3:e7b3f00ed42e BOOK-D "D" |
86 rebasing 3:e7b3f00ed42e BOOK-D "D" |
87 note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes |
87 note: not rebasing 3:e7b3f00ed42e BOOK-D "D", its destination already has all its changes |
88 rebasing 4:69a34c08022a BOOK-E "E" |
88 rebasing 4:69a34c08022a BOOK-E "E" |
89 note: not rebasing 4:69a34c08022a BOOK-E "E", its destination already has all its changes |
89 note: not rebasing 4:69a34c08022a BOOK-E "E", its destination already has all its changes |
90 rebasing 5:6b2aeab91270 F BOOK-F "F" |
90 rebasing 5:6b2aeab91270 BOOK-F F "F" |
91 saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg |
91 saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg |
92 $ hg log -G -T '{rev} {desc} {bookmarks}' |
92 $ hg log -G -T '{rev} {desc} {bookmarks}' |
93 o 5 F BOOK-F |
93 o 5 F BOOK-F |
94 | |
94 | |
95 o 4 C BOOK-C BOOK-D BOOK-E |
95 o 4 C BOOK-C BOOK-D BOOK-E |
141 $ hg rebase -r '(A::)-(B::)-A' -d H --keepbranches |
141 $ hg rebase -r '(A::)-(B::)-A' -d H --keepbranches |
142 rebasing 2:dc0947a82db8 BOOK-C "C" |
142 rebasing 2:dc0947a82db8 BOOK-C "C" |
143 note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes |
143 note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes |
144 rebasing 3:b18e25de2cf5 BOOK-D "D" |
144 rebasing 3:b18e25de2cf5 BOOK-D "D" |
145 note: not rebasing 3:b18e25de2cf5 BOOK-D "D", its destination already has all its changes |
145 note: not rebasing 3:b18e25de2cf5 BOOK-D "D", its destination already has all its changes |
146 rebasing 4:86a1f6686812 E BOOK-E "E" |
146 rebasing 4:86a1f6686812 BOOK-E E "E" |
147 note: not rebasing 4:86a1f6686812 E BOOK-E "E", its destination already has all its changes |
147 note: not rebasing 4:86a1f6686812 BOOK-E E "E", its destination already has all its changes |
148 saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg |
148 saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg |
149 $ hg update null -q |
149 $ hg update null -q |
150 |
150 |
151 $ hg log -G -T '{rev} {desc} {bookmarks}' |
151 $ hg log -G -T '{rev} {desc} {bookmarks}' |
152 o 4 H BOOK-C BOOK-D BOOK-E |
152 o 4 H BOOK-C BOOK-D BOOK-E |
189 > EOS |
189 > EOS |
190 |
190 |
191 $ hg rebase -r '(A::)-(B::)-A' -d H |
191 $ hg rebase -r '(A::)-(B::)-A' -d H |
192 rebasing 2:dc0947a82db8 BOOK-C "C" |
192 rebasing 2:dc0947a82db8 BOOK-C "C" |
193 note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes |
193 note: not rebasing 2:dc0947a82db8 BOOK-C "C", its destination already has all its changes |
194 rebasing 3:b18e25de2cf5 D BOOK-D "D" |
194 rebasing 3:b18e25de2cf5 BOOK-D D "D" |
195 rebasing 4:03ca77807e91 E BOOK-E "E" |
195 rebasing 4:03ca77807e91 BOOK-E E "E" |
196 rebasing 5:ad6717a6a58e BOOK-F "F" |
196 rebasing 5:ad6717a6a58e BOOK-F "F" |
197 note: not rebasing 5:ad6717a6a58e BOOK-F "F", its destination already has all its changes |
197 note: not rebasing 5:ad6717a6a58e BOOK-F "F", its destination already has all its changes |
198 rebasing 6:c58e8bdac1f4 G BOOK-G "G" |
198 rebasing 6:c58e8bdac1f4 BOOK-G G "G" |
199 saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg |
199 saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg |
200 |
200 |
201 $ hg log -G -T '{rev} {desc} {bookmarks}' |
201 $ hg log -G -T '{rev} {desc} {bookmarks}' |
202 o 7 G BOOK-G |
202 o 7 G BOOK-G |
203 |\ |
203 |\ |