##// END OF EJS Templates
tests: fix rebase test broken by earlier cleanup...
Martin von Zweigbergk -
r45046:254c5f71 default
parent child Browse files
Show More
@@ -184,33 +184,33 b' Rebase and collapse - more than one exte'
184
184
185 Rebase and collapse - E onto H:
185 Rebase and collapse - E onto H:
186
186
187 $ hg rebase -s E --dest I --collapse # root (E) is not a merge
187 $ hg rebase -s E --dest H --collapse # root (E) is not a merge
188 abort: unknown revision 'I'!
188 rebasing 5:49cb92066bfd "E" (E)
189 [255]
189 rebasing 6:11abe3fb10b8 "F" (F)
190 rebasing 7:64e264db77f0 "G" (G tip)
191 saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg
190
192
191 $ hg tglog
193 $ hg tglog
192 o 7: 64e264db77f0 'G'
194 o 5: 8b2315790719 'Collapsed revision
193 |\
195 |\ * E
194 | o 6: 11abe3fb10b8 'F'
196 | | * F
195 | |
197 | | * G'
196 | o 5: 49cb92066bfd 'E'
198 | o 4: 4e4f9194f9f1 'D'
199 | |\
200 o | | 3: 575c4b5ec114 'H'
201 | | |
202 +---o 2: dc0947a82db8 'C'
197 | |
203 | |
198 o | 4: 4e4f9194f9f1 'D'
204 | o 1: 112478962961 'B'
199 |\|
200 | | o 3: 575c4b5ec114 'H'
201 | | |
202 o---+ 2: dc0947a82db8 'C'
203 / /
204 o / 1: 112478962961 'B'
205 |/
205 |/
206 o 0: 426bada5c675 'A'
206 o 0: 426bada5c675 'A'
207
207
208 $ hg manifest --rev tip
208 $ hg manifest --rev tip
209 A
209 A
210 B
211 C
210 C
212 E
211 E
213 F
212 F
213 H
214
214
215 $ cd ..
215 $ cd ..
216
216
General Comments 0
You need to be logged in to leave comments. Login now