New Upstream Snapshot - mutt
There were merge conflicts while merging a new upstream version.
More details
Historical runs
- upstream-merged-conflicts: Merging upstream version 2.2.7 resulted in conflicts.
- quilt-refresh-error: An error occurred refreshing quilt patch debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch: Applying patch debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch patching file doc/manual.html can't find file to patch at input line 23 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/doc/mutt.info |+++ b/doc/mutt.info -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 34 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/doc/mutt.texi |+++ b/doc/mutt.texi -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file doc/muttrc.man patching file doc/reference.html Patch debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch does not apply (enforce with -f)
- quilt-refresh-error: An error occurred refreshing quilt patch debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch: Applying patch debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch patching file doc/manual.html can't find file to patch at input line 23 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/doc/mutt.info |+++ b/doc/mutt.info -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 34 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/doc/mutt.texi |+++ b/doc/mutt.texi -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file doc/muttrc.man patching file doc/reference.html Patch debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch does not apply (enforce with -f)
- quilt-refresh-error: An error occurred refreshing quilt patch debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch: Applying patch debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch patching file doc/manual.html can't find file to patch at input line 23 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/doc/mutt.info |+++ b/doc/mutt.info -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 34 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/doc/mutt.texi |+++ b/doc/mutt.texi -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file doc/muttrc.man patching file doc/reference.html Patch debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch does not apply (enforce with -f)
- quilt-refresh-error: An error occurred refreshing quilt patch debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch: Applying patch debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch patching file doc/manual.html can't find file to patch at input line 23 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/doc/mutt.info |+++ b/doc/mutt.info -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 34 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/doc/mutt.texi |+++ b/doc/mutt.texi -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file doc/muttrc.man patching file doc/reference.html Patch debian/patches/debian-specific/530584-default-tmpdir-to-var-tmp-docs.patch does not apply (enforce with -f)
- quilt-refresh-error: An error occurred refreshing quilt patch debian-specific/document_debian_defaults.patch: Applying patch debian/patches/debian-specific/document_debian_defaults.patch patching file init.h Hunk #1 succeeded at 561 (offset 27 lines). Hunk #2 succeeded at 1602 (offset 43 lines). Hunk #3 FAILED at 2302. Hunk #4 succeeded at 4088 (offset 108 lines). Hunk #5 succeeded at 4310 with fuzz 2 (offset 138 lines). Hunk #6 succeeded at 4885 (offset 139 lines). 1 out of 6 hunks FAILED -- rejects in file init.h Patch debian/patches/debian-specific/document_debian_defaults.patch does not apply (enforce with -f)