Show More
@@ -87,8 +87,8 b' directory:' | |||||
87 | $ hg co -qr 'desc(first_rebase_source)' |
|
87 | $ hg co -qr 'desc(first_rebase_source)' | |
88 | $ cd $TESTTMP/hgrebase/somedir |
|
88 | $ cd $TESTTMP/hgrebase/somedir | |
89 | $ hg --config extensions.rebase= rebase -qr . -d 'desc(first_rebase_dest)' |
|
89 | $ hg --config extensions.rebase= rebase -qr . -d 'desc(first_rebase_dest)' | |
90 | current directory was removed |
|
90 | current directory was removed (rmcwd !) | |
91 | (consider changing to repo root: $TESTTMP/hgrebase) |
|
91 | (consider changing to repo root: $TESTTMP/hgrebase) (rmcwd !) | |
92 | $ cd $TESTTMP/hgrebase/somedir |
|
92 | $ cd $TESTTMP/hgrebase/somedir | |
93 | (The current node is the rebased first_rebase_source on top of |
|
93 | (The current node is the rebased first_rebase_source on top of | |
94 | first_rebase_dest) |
|
94 | first_rebase_dest) | |
@@ -174,7 +174,9 b' Enter the first directory:' | |||||
174 |
|
174 | |||
175 | Histedit doing 'pick, pick, fold': |
|
175 | Histedit doing 'pick, pick, fold': | |
176 |
|
176 | |||
177 | $ hg histedit --commands /dev/stdin <<EOF |
|
177 | #if rmcwd | |
|
178 | ||||
|
179 | $ hg histedit --commands - <<EOF | |||
178 | > pick 6274c77c93c3 1 add bar |
|
180 | > pick 6274c77c93c3 1 add bar | |
179 | > pick ff70a87b588f 0 add foo |
|
181 | > pick ff70a87b588f 0 add foo | |
180 | > fold 9992bb0ac0db 2 add baz |
|
182 | > fold 9992bb0ac0db 2 add baz | |
@@ -196,6 +198,25 b" successfully, but doesn't really do anyt" | |||||
196 | 1:5c806432464a add foo |
|
198 | 1:5c806432464a add foo | |
197 | 0:d17db4b0303a add bar |
|
199 | 0:d17db4b0303a add bar | |
198 |
|
200 | |||
|
201 | #else | |||
|
202 | ||||
|
203 | $ cd $TESTTMP/issue5826_withrm | |||
|
204 | ||||
|
205 | $ hg histedit --commands - <<EOF | |||
|
206 | > pick 6274c77c93c3 1 add bar | |||
|
207 | > pick ff70a87b588f 0 add foo | |||
|
208 | > fold 9992bb0ac0db 2 add baz | |||
|
209 | > EOF | |||
|
210 | saved backup bundle to $TESTTMP/issue5826_withrm/.hg/strip-backup/5c806432464a-cd4c8d86-histedit.hg | |||
|
211 | ||||
|
212 | $ hg log -T '{rev}:{node|short} {desc}\n' | |||
|
213 | 1:b9eddaa97cbc add foo | |||
|
214 | *** | |||
|
215 | add baz | |||
|
216 | 0:d17db4b0303a add bar | |||
|
217 | ||||
|
218 | #endif | |||
|
219 | ||||
199 | Now test that again with experimental.removeemptydirs=false: |
|
220 | Now test that again with experimental.removeemptydirs=false: | |
200 | $ hg init issue5826_norm |
|
221 | $ hg init issue5826_norm | |
201 | $ cd issue5826_norm |
|
222 | $ cd issue5826_norm | |
@@ -227,7 +248,7 b' Enter the first directory:' | |||||
227 |
|
248 | |||
228 | Histedit doing 'pick, pick, fold': |
|
249 | Histedit doing 'pick, pick, fold': | |
229 |
|
250 | |||
230 |
$ hg histedit --commands |
|
251 | $ hg histedit --commands - <<EOF | |
231 | > pick 6274c77c93c3 1 add bar |
|
252 | > pick 6274c77c93c3 1 add bar | |
232 | > pick ff70a87b588f 0 add foo |
|
253 | > pick ff70a87b588f 0 add foo | |
233 | > fold 9992bb0ac0db 2 add baz |
|
254 | > fold 9992bb0ac0db 2 add baz | |
@@ -275,6 +296,9 b" reproduce; we're using a separate file d" | |||||
275 | > y |
|
296 | > y | |
276 | > a |
|
297 | > a | |
277 | > EOF |
|
298 | > EOF | |
|
299 | ||||
|
300 | The split succeeds on no-rmcwd platforms, which alters the rest of the tests | |||
|
301 | #if rmcwd | |||
278 | $ cat ../split_commands | hg split |
|
302 | $ cat ../split_commands | hg split | |
279 | current directory was removed |
|
303 | current directory was removed | |
280 | (consider changing to repo root: $TESTTMP/hgsplit) |
|
304 | (consider changing to repo root: $TESTTMP/hgsplit) | |
@@ -292,6 +316,7 b" reproduce; we're using a separate file d" | |||||
292 |
|
316 | |||
293 | abort: $ENOENT$ |
|
317 | abort: $ENOENT$ | |
294 | [255] |
|
318 | [255] | |
|
319 | #endif | |||
295 |
|
320 | |||
296 | Let's try that again without the rmdir |
|
321 | Let's try that again without the rmdir | |
297 | $ cd $TESTTMP/hgsplit/somedir |
|
322 | $ cd $TESTTMP/hgsplit/somedir |
General Comments 0
You need to be logged in to leave comments.
Login now