equal
deleted
inserted
replaced
342 next line |
342 next line |
343 --- |
343 --- |
344 $ rm -r b |
344 $ rm -r b |
345 |
345 |
346 |
346 |
347 We weren't backing up the correct dirstate file when importing many patches |
347 Issue963: Parent of working dir incorrect after import of multiple |
348 (issue963) |
348 patches and rollback |
349 import patch1 patch2; rollback |
349 |
|
350 We weren't backing up the correct dirstate file when importing many |
|
351 patches: import patch1 patch2; rollback |
350 |
352 |
351 $ echo line 3 >> a/a |
353 $ echo line 3 >> a/a |
352 $ hg --cwd a ci -m'third change' |
354 $ hg --cwd a ci -m'third change' |
353 $ hg --cwd a export -o '../patch%R' 1 2 |
355 $ hg --cwd a export -o '../patch%R' 1 2 |
354 $ hg clone -qr0 a b |
356 $ hg clone -qr0 a b |
540 applying remove.diff |
542 applying remove.diff |
541 $ hg manifest |
543 $ hg manifest |
542 $ cd .. |
544 $ cd .. |
543 |
545 |
544 |
546 |
545 test update+rename with common name (issue 927) |
547 Issue927: test update+rename with common name |
546 |
548 |
547 $ hg init t |
549 $ hg init t |
548 $ cd t |
550 $ cd t |
549 $ touch a |
551 $ touch a |
550 $ hg ci -Am t |
552 $ hg ci -Am t |
659 A b |
661 A b |
660 R a |
662 R a |
661 $ cd .. |
663 $ cd .. |
662 |
664 |
663 |
665 |
664 add empty file from the end of patch (issue 1495) |
666 Issue1495: add empty file from the end of patch |
665 |
667 |
666 $ hg init addemptyend |
668 $ hg init addemptyend |
667 $ cd addemptyend |
669 $ cd addemptyend |
668 $ touch a |
670 $ touch a |
669 $ hg addremove |
671 $ hg addremove |
714 applying ../create2.patch |
716 applying ../create2.patch |
715 $ cat foo |
717 $ cat foo |
716 a |
718 a |
717 |
719 |
718 |
720 |
719 first line mistaken for email headers (issue 1859) |
721 Issue1859: first line mistaken for email headers |
720 |
722 |
721 $ hg init emailconfusion |
723 $ hg init emailconfusion |
722 $ cd emailconfusion |
724 $ cd emailconfusion |
723 $ cat > a.patch <<EOF |
725 $ cat > a.patch <<EOF |
724 > module: summary |
726 > module: summary |
823 @@ -0,0 +1,1 @@ |
825 @@ -0,0 +1,1 @@ |
824 +foo |
826 +foo |
825 $ cd .. |
827 $ cd .. |
826 |
828 |
827 |
829 |
828 issue2102 |
830 Issue2102: hg export and hg import speak different languages |
829 |
831 |
830 $ hg init issue2102 |
832 $ hg init issue2102 |
831 $ cd issue2102 |
833 $ cd issue2102 |
832 $ mkdir -p src/cmd/gc |
834 $ mkdir -p src/cmd/gc |
833 $ touch src/cmd/gc/mksys.bash |
835 $ touch src/cmd/gc/mksys.bash |