equal
deleted
inserted
replaced
624 $ echo d > dir/d |
624 $ echo d > dir/d |
625 $ hg ci -Am addbcd |
625 $ hg ci -Am addbcd |
626 adding dir/d |
626 adding dir/d |
627 adding dir/dir2/b |
627 adding dir/dir2/b |
628 adding dir/dir2/c |
628 adding dir/dir2/c |
|
629 |
|
630 prefix '.' is the same as no prefix |
|
631 $ hg import --no-commit --prefix . - <<EOF |
|
632 > diff --git a/dir/a b/dir/a |
|
633 > --- /dev/null |
|
634 > +++ b/dir/a |
|
635 > @@ -0,0 +1 @@ |
|
636 > +aaaa |
|
637 > diff --git a/dir/d b/dir/d |
|
638 > --- a/dir/d |
|
639 > +++ b/dir/d |
|
640 > @@ -1,1 +1,2 @@ |
|
641 > d |
|
642 > +dddd |
|
643 > EOF |
|
644 applying patch from stdin |
|
645 $ cat dir/a |
|
646 aaaa |
|
647 $ cat dir/d |
|
648 d |
|
649 dddd |
|
650 $ hg revert -aC |
|
651 forgetting dir/a (glob) |
|
652 reverting dir/d (glob) |
|
653 $ rm dir/a |
|
654 |
|
655 prefix with default strip |
629 $ hg import --no-commit --prefix dir/ - <<EOF |
656 $ hg import --no-commit --prefix dir/ - <<EOF |
630 > diff --git a/a b/a |
657 > diff --git a/a b/a |
631 > --- /dev/null |
658 > --- /dev/null |
632 > +++ b/a |
659 > +++ b/a |
633 > @@ -0,0 +1 @@ |
660 > @@ -0,0 +1 @@ |
647 dd |
674 dd |
648 $ hg revert -aC |
675 $ hg revert -aC |
649 forgetting dir/a (glob) |
676 forgetting dir/a (glob) |
650 reverting dir/d (glob) |
677 reverting dir/d (glob) |
651 $ rm dir/a |
678 $ rm dir/a |
652 (test that prefixes are relative to the root) |
679 (test that prefixes are relative to the cwd) |
653 $ mkdir tmpdir |
680 $ mkdir tmpdir |
654 $ cd tmpdir |
681 $ cd tmpdir |
655 $ hg import --no-commit -p2 --prefix dir/ - <<EOF |
682 $ hg import --no-commit -p2 --prefix ../dir/ - <<EOF |
656 > diff --git a/foo/a b/foo/a |
683 > diff --git a/foo/a b/foo/a |
657 > new file mode 100644 |
684 > new file mode 100644 |
658 > --- /dev/null |
685 > --- /dev/null |
659 > +++ b/foo/a |
686 > +++ b/foo/a |
660 > @@ -0,0 +1 @@ |
687 > @@ -0,0 +1 @@ |