summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2006-02-01 15:12:10 +0000
committerAndreas Gruenbacher <agruen@suse.de>2006-02-01 15:12:10 +0000
commit2f7e4720494947705f2bc1d87075047898bb7c26 (patch)
tree7371a86b8c7d8025052901e401bb5413e537e567
parent2674c762e8cefa7046d297c83dd1174ed0f51f44 (diff)
downloadquilt-2f7e4720494947705f2bc1d87075047898bb7c26.tar.gz
- Add "testcase" for -p0 patches that are applied in different
directories. We occasionally have this condition in spec files, and it would be really great if quilt setup could cope better.
-rw-r--r--compat/.cvsignore1
-rw-r--r--test/basedir.no-test29
2 files changed, 30 insertions, 0 deletions
diff --git a/compat/.cvsignore b/compat/.cvsignore
index 5d553e5..0b52907 100644
--- a/compat/.cvsignore
+++ b/compat/.cvsignore
@@ -5,3 +5,4 @@ diffstat
getopt
mktemp
sendmail
+date
diff --git a/test/basedir.no-test b/test/basedir.no-test
new file mode 100644
index 0000000..26506a5
--- /dev/null
+++ b/test/basedir.no-test
@@ -0,0 +1,29 @@
+ $ rm -rf d
+ $ mkdir -p d/patches
+ $ cd d
+
+ $ echo foo.orig > foo.orig
+ $ echo foo > foo
+ $ diff -u foo.orig foo > patches/foo.diff
+ $ mv foo.orig foo
+
+ $ mkdir subdir
+ $ cd subdir
+ $ echo bar.orig > bar.orig
+ $ echo bar > bar
+ $ diff -u bar.orig bar > ../patches/bar.diff
+ $ mv bar.orig bar
+ $ cd ..
+
+ #$ export QUILT_PATCHES=$PWD/patches
+ $ cat > patches/series
+ < foo.diff -p0
+ < bar.diff -p0 -d subdir
+
+ $ quilt push -qa
+ > Applying patch patches/foo.diff
+ > Applying patch patches/bar.diff
+ > Now at patch patches/bar.diff
+
+ $ cd ..
+ $ rm -rf d