equal
deleted
inserted
replaced
232 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
232 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
233 $ sed 's/1,1/foo/' < diffed-tip.patch > broken.patch |
233 $ sed 's/1,1/foo/' < diffed-tip.patch > broken.patch |
234 $ hg --cwd b import -mpatch ../broken.patch |
234 $ hg --cwd b import -mpatch ../broken.patch |
235 applying ../broken.patch |
235 applying ../broken.patch |
236 abort: bad hunk #1 |
236 abort: bad hunk #1 |
237 [255] |
237 [10] |
238 $ rm -r b |
238 $ rm -r b |
239 |
239 |
240 hg -R repo import |
240 hg -R repo import |
241 put the clone in a subdir - having a directory named "a" |
241 put the clone in a subdir - having a directory named "a" |
242 used to hide a bug. |
242 used to hide a bug. |
832 applying fuzzy-tip.patch |
832 applying fuzzy-tip.patch |
833 patching file a |
833 patching file a |
834 Hunk #1 FAILED at 0 |
834 Hunk #1 FAILED at 0 |
835 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
835 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
836 abort: patch failed to apply |
836 abort: patch failed to apply |
837 [255] |
837 [20] |
838 $ hg import --no-commit -v fuzzy-tip.patch |
838 $ hg import --no-commit -v fuzzy-tip.patch |
839 applying fuzzy-tip.patch |
839 applying fuzzy-tip.patch |
840 patching file a |
840 patching file a |
841 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
841 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
842 applied to working directory |
842 applied to working directory |
851 applying fuzzy-reparent.patch |
851 applying fuzzy-reparent.patch |
852 patching file a |
852 patching file a |
853 Hunk #1 FAILED at 0 |
853 Hunk #1 FAILED at 0 |
854 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
854 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
855 abort: patch failed to apply |
855 abort: patch failed to apply |
856 [255] |
856 [20] |
857 $ hg up -qC |
857 $ hg up -qC |
858 $ hg import --config patch.fuzz=2 --exact fuzzy-reparent.patch |
858 $ hg import --config patch.fuzz=2 --exact fuzzy-reparent.patch |
859 applying fuzzy-reparent.patch |
859 applying fuzzy-reparent.patch |
860 patching file a |
860 patching file a |
861 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
861 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
2052 applying patch from stdin |
2052 applying patch from stdin |
2053 unable to find 'file1' for patching |
2053 unable to find 'file1' for patching |
2054 (use '--prefix' to apply patch relative to the current directory) |
2054 (use '--prefix' to apply patch relative to the current directory) |
2055 1 out of 1 hunks FAILED -- saving rejects to file file1.rej |
2055 1 out of 1 hunks FAILED -- saving rejects to file file1.rej |
2056 abort: patch failed to apply |
2056 abort: patch failed to apply |
2057 [255] |
2057 [20] |
2058 |
2058 |
2059 test import crash (issue5375) |
2059 test import crash (issue5375) |
2060 $ cd .. |
2060 $ cd .. |
2061 $ hg init repo |
2061 $ hg init repo |
2062 $ cd repo |
2062 $ cd repo |
2063 $ printf "diff --git a/a b/b\nrename from a\nrename to b" | hg import - |
2063 $ printf "diff --git a/a b/b\nrename from a\nrename to b" | hg import - |
2064 applying patch from stdin |
2064 applying patch from stdin |
2065 a not tracked! |
2065 a not tracked! |
2066 abort: source file 'a' does not exist |
2066 abort: source file 'a' does not exist |
2067 [255] |
2067 [20] |
2068 |
2068 |
2069 test immature end of hunk |
2069 test immature end of hunk |
2070 |
2070 |
2071 $ hg import - <<'EOF' |
2071 $ hg import - <<'EOF' |
2072 > diff --git a/foo b/foo |
2072 > diff --git a/foo b/foo |
2074 > --- b/foo |
2074 > --- b/foo |
2075 > @@ -0,0 +1,1 @@ |
2075 > @@ -0,0 +1,1 @@ |
2076 > EOF |
2076 > EOF |
2077 applying patch from stdin |
2077 applying patch from stdin |
2078 abort: bad hunk #1: incomplete hunk |
2078 abort: bad hunk #1: incomplete hunk |
2079 [255] |
2079 [10] |
2080 |
2080 |
2081 $ hg import - <<'EOF' |
2081 $ hg import - <<'EOF' |
2082 > diff --git a/foo b/foo |
2082 > diff --git a/foo b/foo |
2083 > --- a/foo |
2083 > --- a/foo |
2084 > --- b/foo |
2084 > --- b/foo |
2085 > @@ -0,0 +1,1 @@ |
2085 > @@ -0,0 +1,1 @@ |
2086 > \ No newline at end of file |
2086 > \ No newline at end of file |
2087 > EOF |
2087 > EOF |
2088 applying patch from stdin |
2088 applying patch from stdin |
2089 abort: bad hunk #1: incomplete hunk |
2089 abort: bad hunk #1: incomplete hunk |
2090 [255] |
2090 [10] |