342 abort: cannot use --exact and --keep-changes together |
342 abort: cannot use --exact and --keep-changes together |
343 [255] |
343 [255] |
344 $ echo b >> b |
344 $ echo b >> b |
345 $ hg qpush --keep-changes |
345 $ hg qpush --keep-changes |
346 applying p3 |
346 applying p3 |
347 errors during apply, please fix and refresh p2 |
347 abort: conflicting local changes found |
348 [2] |
348 (did you forget to qrefresh?) |
|
349 [255] |
349 $ rm b |
350 $ rm b |
350 $ hg qpush --keep-changes |
351 $ hg qpush --keep-changes |
351 applying p3 |
352 applying p3 |
352 errors during apply, please fix and refresh p2 |
353 abort: conflicting local changes found |
353 [2] |
354 (did you forget to qrefresh?) |
|
355 [255] |
354 $ hg rm -A b |
356 $ hg rm -A b |
355 $ hg qpush --keep-changes |
357 $ hg qpush --keep-changes |
356 applying p3 |
358 applying p3 |
357 errors during apply, please fix and refresh p2 |
359 abort: conflicting local changes found |
358 [2] |
360 (did you forget to qrefresh?) |
|
361 [255] |
359 $ hg revert -aq b |
362 $ hg revert -aq b |
360 $ echo d > d |
363 $ echo d > d |
361 $ hg add d |
364 $ hg add d |
362 $ hg qpush --keep-changes |
365 $ hg qpush --keep-changes |
363 applying p3 |
366 applying p3 |
364 errors during apply, please fix and refresh p2 |
367 abort: conflicting local changes found |
365 [2] |
368 (did you forget to qrefresh?) |
|
369 [255] |
366 $ hg forget d |
370 $ hg forget d |
367 $ rm d |
371 $ rm d |
368 $ hg qpop |
372 $ hg qpop |
369 popping p2 |
373 popping p2 |
370 patch queue now empty |
374 patch queue now empty |
371 $ echo b >> b |
375 $ echo b >> b |
372 $ hg qpush -a --keep-changes |
376 $ hg qpush -a --keep-changes |
373 applying p2 |
377 applying p2 |
374 applying p3 |
378 applying p3 |
375 errors during apply, please fix and refresh p2 |
379 abort: conflicting local changes found |
376 [2] |
380 (did you forget to qrefresh?) |
|
381 [255] |
377 $ hg qtop |
382 $ hg qtop |
378 p2 |
383 p2 |
379 $ hg parents --template "{rev} {desc}\n" |
384 $ hg parents --template "{rev} {desc}\n" |
380 2 imported patch p2 |
385 2 imported patch p2 |
381 $ hg st b |
386 $ hg st b |