tags 752624 + moreinfo thanks Hello,
I tried to reproduce your issue, in vain. The attached test file works just well, and your bug report does not contain any specific error message that I could grep onto. Just FYI, the problem does not come from the fact that I import something in patches instead of debian/patches, because patches is the default setting that we usually override in debian. Could you please help me reproducing the bug so that I can fix it? If you want to play with that test file, download the source of the package, and apply all the patches of the debian set: QUILT_PATCHES=debian/patches quilt push -a Copy the test file to tests/ and then run "./configure && make check" Thanks for your time, Mt. On Wed, Jun 25, 2014 at 09:24:14AM +0000, Alad Wenter wrote: > Package: quilt > Version: 0.63-3 > Severity: normal > > Dear maintainer, > > When using quilt import to import a patch stored in debian/patches, the patch > is not properly registered and > an "upstream changes" error occurs on building the package. However, as the > error suggests the patch is still > applied. I assume the intention is for quilt not to overwrite any existing > patches on import (compare quilt -f), > however it should then at least give a proper warning and not patch the > source. > > For the record quilt import from /tmp or similar works fine. > > Regards, > > Alad > > -- System Information: > Debian Release: jessie/sid > APT prefers unstable > APT policy: (500, 'unstable') > Architecture: amd64 (x86_64) > > Kernel: Linux 3.14.8-2-ck (SMP w/2 CPU cores; PREEMPT) > Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) (ignored: LC_ALL set to C) > Shell: /bin/sh linked to /bin/dash > > Versions of packages quilt depends on: > ii bsdmainutils 9.0.5 > ii bzip2 1.0.6-5 > ii diffstat 1.58-1 > ii gettext 0.18.3.2-2 > ii patch 2.7.1-5 > ii perl 5.18.2-4 > > Versions of packages quilt recommends: > pn less <none> > > Versions of packages quilt suggests: > pn default-mta | mail-transport-agent <none> > pn graphviz <none> > pn procmail <none> > > -- no debconf information > -- Les ascètes extremistes meurent-ils parfois d'overdoses de manque ?
# Test the (supposedly buggy) import of patches located in patches directory
# QUILT_PATCHEs defaults to patches and not debian/patches in this test
$ mkdir patches
$ cat > patches/some-patch.diff
< Index: b/file.txt
< ===================================================================
< --- a/file.txt
< +++ b/file.txt
< @@ -0,0 +1 @@
< +Some content
$ quilt import patches/some-patch.diff
> Importing patch %{P}some-patch.diff
$ cat patches/some-patch.diff
> Index: b/file.txt
> ===================================================================
> --- a/file.txt
> +++ b/file.txt
> @@ -0,0 +1 @@
> +Some content
$ quilt push
> Applying patch %{P}some-patch.diff
> patching file file.txt
>
> Now at patch %{P}some-patch.diff
$ echo Some more content >> file.txt
$ quilt refresh -pab
> Refreshed patch %{P}some-patch.diff
$ cat patches/some-patch.diff
> Index: b/file.txt
> ===================================================================
> --- /dev/null
> +++ b/file.txt
> @@ -0,0 +1,2 @@
> +Some content
> +Some more content
signature.asc
Description: Digital signature
