equal
deleted
inserted
replaced
85 |
85 |
86 $ hg rebase --source '1 & !1' |
86 $ hg rebase --source '1 & !1' |
87 abort: empty "source" revision set - nothing to rebase |
87 abort: empty "source" revision set - nothing to rebase |
88 [255] |
88 [255] |
89 |
89 |
|
90 $ hg rebase --base '1 & !1' |
|
91 abort: empty "base" revision set - can't compute rebase set |
|
92 [255] |
|
93 |
90 $ hg rebase |
94 $ hg rebase |
91 nothing to rebase |
95 nothing to rebase - working directory parent is also destination |
|
96 [1] |
|
97 |
|
98 $ hg rebase -b. |
|
99 nothing to rebase - e7ec4e813ba6 is both "base" and destination |
92 [1] |
100 [1] |
93 |
101 |
94 $ hg up -q 7 |
102 $ hg up -q 7 |
95 |
103 |
96 $ hg rebase --traceback |
104 $ hg rebase --traceback |
97 nothing to rebase |
105 nothing to rebase - working directory parent is already an ancestor of destination e7ec4e813ba6 |
|
106 [1] |
|
107 |
|
108 $ hg rebase -b. |
|
109 nothing to rebase - "base" 02de42196ebe is already an ancestor of destination e7ec4e813ba6 |
98 [1] |
110 [1] |
99 |
111 |
100 $ hg rebase --dest '1 & !1' |
112 $ hg rebase --dest '1 & !1' |
101 abort: empty revision set |
113 abort: empty revision set |
102 [255] |
114 [255] |
134 $ hg rollback |
146 $ hg rollback |
135 no rollback information available |
147 no rollback information available |
136 [1] |
148 [1] |
137 |
149 |
138 $ cd .. |
150 $ cd .. |
139 |
|
140 |
151 |
141 Rebase with base == '.' => same as no arguments (from 3 onto 8): |
152 Rebase with base == '.' => same as no arguments (from 3 onto 8): |
142 |
153 |
143 $ hg clone -q -u 3 a a2 |
154 $ hg clone -q -u 3 a a2 |
144 $ cd a2 |
155 $ cd a2 |