equal
deleted
inserted
replaced
74 |/ |
74 |/ |
75 o 0: 1994f17a630e 'A' bookmarks: Y@diverge |
75 o 0: 1994f17a630e 'A' bookmarks: Y@diverge |
76 |
76 |
77 $ hg rebase -s Y -d 3 |
77 $ hg rebase -s Y -d 3 |
78 rebasing 2:49cb3485fa0c "C" (Y Z) |
78 rebasing 2:49cb3485fa0c "C" (Y Z) |
79 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg (glob) |
79 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg |
80 |
80 |
81 $ hg tglog |
81 $ hg tglog |
82 @ 3: 17fb3faba63c 'C' bookmarks: Y Z |
82 @ 3: 17fb3faba63c 'C' bookmarks: Y Z |
83 | |
83 | |
84 o 2: 41acb9dca9eb 'D' bookmarks: W X@diverge |
84 o 2: 41acb9dca9eb 'D' bookmarks: W X@diverge |
96 $ hg up -q 2 |
96 $ hg up -q 2 |
97 $ hg book W@diverge |
97 $ hg book W@diverge |
98 |
98 |
99 $ hg rebase -s W -d . |
99 $ hg rebase -s W -d . |
100 rebasing 3:41acb9dca9eb "D" (W tip) |
100 rebasing 3:41acb9dca9eb "D" (W tip) |
101 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg (glob) |
101 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg |
102 |
102 |
103 $ hg bookmarks |
103 $ hg bookmarks |
104 W 3:0d3554f74897 |
104 W 3:0d3554f74897 |
105 X 1:6c81ed0049f8 |
105 X 1:6c81ed0049f8 |
106 Y 2:49cb3485fa0c |
106 Y 2:49cb3485fa0c |
115 $ hg up -q Z |
115 $ hg up -q Z |
116 |
116 |
117 $ hg rebase -s 1 -d 3 |
117 $ hg rebase -s 1 -d 3 |
118 rebasing 1:6c81ed0049f8 "B" (X) |
118 rebasing 1:6c81ed0049f8 "B" (X) |
119 rebasing 2:49cb3485fa0c "C" (Y Z) |
119 rebasing 2:49cb3485fa0c "C" (Y Z) |
120 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob) |
120 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg |
121 |
121 |
122 $ hg tglog |
122 $ hg tglog |
123 @ 3: 3d5fa227f4b5 'C' bookmarks: Y Z |
123 @ 3: 3d5fa227f4b5 'C' bookmarks: Y Z |
124 | |
124 | |
125 o 2: e926fccfa8ec 'B' bookmarks: X |
125 o 2: e926fccfa8ec 'B' bookmarks: X |
138 $ hg up -q X |
138 $ hg up -q X |
139 |
139 |
140 $ hg rebase -d W |
140 $ hg rebase -d W |
141 rebasing 1:6c81ed0049f8 "B" (X) |
141 rebasing 1:6c81ed0049f8 "B" (X) |
142 rebasing 2:49cb3485fa0c "C" (Y Z) |
142 rebasing 2:49cb3485fa0c "C" (Y Z) |
143 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob) |
143 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg |
144 |
144 |
145 $ hg tglog |
145 $ hg tglog |
146 o 3: 3d5fa227f4b5 'C' bookmarks: Y Z |
146 o 3: 3d5fa227f4b5 'C' bookmarks: Y Z |
147 | |
147 | |
148 @ 2: e926fccfa8ec 'B' bookmarks: X |
148 @ 2: e926fccfa8ec 'B' bookmarks: X |
178 $ hg resolve --mark c |
178 $ hg resolve --mark c |
179 (no more unresolved files) |
179 (no more unresolved files) |
180 continue: hg rebase --continue |
180 continue: hg rebase --continue |
181 $ hg rebase --continue |
181 $ hg rebase --continue |
182 rebasing 3:3d5fa227f4b5 "C" (Y Z) |
182 rebasing 3:3d5fa227f4b5 "C" (Y Z) |
183 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg (glob) |
183 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg |
184 $ hg tglog |
184 $ hg tglog |
185 @ 4: 45c0f0ec1203 'C' bookmarks: Y Z |
185 @ 4: 45c0f0ec1203 'C' bookmarks: Y Z |
186 | |
186 | |
187 o 3: b0e10b7175fd 'other C' bookmarks: |
187 o 3: b0e10b7175fd 'other C' bookmarks: |
188 | |
188 | |
208 $ hg update -q Y |
208 $ hg update -q Y |
209 $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z |
209 $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z |
210 rebasing 5:345c90f326a4 "bisect" |
210 rebasing 5:345c90f326a4 "bisect" |
211 rebasing 6:f677a2907404 "bisect2" |
211 rebasing 6:f677a2907404 "bisect2" |
212 rebasing 7:325c16001345 "bisect3" (bisect tip) |
212 rebasing 7:325c16001345 "bisect3" (bisect tip) |
213 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg (glob) |
213 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg |
214 |
214 |
215 Bookmark and working parent get moved even if --keep is set (issue5682) |
215 Bookmark and working parent get moved even if --keep is set (issue5682) |
216 |
216 |
217 $ hg init $TESTTMP/book-keep |
217 $ hg init $TESTTMP/book-keep |
218 $ cd $TESTTMP/book-keep |
218 $ cd $TESTTMP/book-keep |