##// END OF EJS Templates
tests: move rebase-keep-branch into rebase-named-branches...
Nicolas Dumazet -
r14124:81ecc951 default
parent child Browse files
Show More
@@ -56,29 +56,51 b' Rebasing descendant onto ancestor across'
56
56
57
57
58
58
59 $ hg rebase -s 7 -d 8
59 $ hg rebase -s 1 -d 8 --keepbranches
60 abort: source is ancestor of destination
61 [255]
62
63 $ hg rebase -s 8 -d 7
64 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
60 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
65
61
66 $ hg tglog
62 $ hg tglog
67 @ 8: 'extra named branch'
63 @ 8: 'D'
68 |
64 |
69 o 7: 'H'
65 o 7: 'C'
66 |
67 o 6: 'B'
70 |
68 |
71 | o 6: 'G'
69 o 5: 'extra named branch' dev
70 |
71 o 4: 'H'
72 |
73 | o 3: 'G'
72 |/|
74 |/|
73 o | 5: 'F'
75 o | 2: 'F'
74 | |
76 | |
75 | o 4: 'E'
77 | o 1: 'E'
76 |/
78 |/
77 | o 3: 'D'
79 o 0: 'A'
80
81 $ hg rebase -s 4 -d 5
82 abort: source is ancestor of destination
83 [255]
84
85 $ hg rebase -s 5 -d 4
86 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
87
88 $ hg tglog
89 @ 8: 'D'
90 |
91 o 7: 'C'
92 |
93 o 6: 'B'
94 |
95 o 5: 'extra named branch'
96 |
97 o 4: 'H'
98 |
99 | o 3: 'G'
100 |/|
101 o | 2: 'F'
78 | |
102 | |
79 | o 2: 'C'
103 | o 1: 'E'
80 | |
81 | o 1: 'B'
82 |/
104 |/
83 o 0: 'A'
105 o 0: 'A'
84
106
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now