summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2007-05-06 12:40:06 +0000
committerAndreas Gruenbacher <agruen@suse.de>2007-05-06 12:40:06 +0000
commitbd1dfdab48e3cda765b37efa7d61fb51ae113b4a (patch)
treea10189c9fabbd319ce15ab71f0e3671a3c6dc4e2 /test
parentf08763e88006195c13c2072c466e248d9cb001a1 (diff)
downloadquilt-bd1dfdab48e3cda765b37efa7d61fb51ae113b4a.tar.gz
- Mail command: when only a single patch is specified, only mail
that one. Only mail all patches to the end of the series if the last patch is '-', or no patches have been specified. - Revert command: change semantics to really revert the changes relative to the patch instead of removing the file from the patch. That's much more useful; the other behavior is available as ``quilt diff <file> | patch -p1'', anyway. - Update German translation.
Diffstat (limited to 'test')
-rw-r--r--test/perms.test6
-rw-r--r--test/revert.test41
-rw-r--r--test/revert2.test3
-rw-r--r--test/snapshot.test4
-rw-r--r--test/snapshot2.test4
-rw-r--r--test/subdir.test7
6 files changed, 27 insertions, 38 deletions
diff --git a/test/perms.test b/test/perms.test
index 29c3cfe..db13286 100644
--- a/test/perms.test
+++ b/test/perms.test
@@ -56,11 +56,5 @@ the backup file.
> Removing patch %{P}test2.diff
> Now at patch %{P}test.diff
- $ quilt revert foo
- > Changes to foo in patch %{P}test.diff reverted
-
- $ ls -l foo | awk '{ print $1,$NF }'
- > -rwx---r-- foo
-
$ cd ..
$ rm -rf d
diff --git a/test/revert.test b/test/revert.test
index cf7eae6..8656391 100644
--- a/test/revert.test
+++ b/test/revert.test
@@ -2,49 +2,54 @@
$ mkdir -p d/patches
$ cd d
- $ echo f1 > f
- $ echo g1 > g
+ $ mkdir sub
+ $ echo f1 > sub/f
+ $ echo g1 > sub/g
$ quilt new p.diff
> Patch patches/p.diff is now on top
- $ quilt add f g h
- > File f added to patch patches/p.diff
- > File g added to patch patches/p.diff
- > File h added to patch patches/p.diff
+ $ quilt add sub/f sub/g sub/h
+ > File sub/f added to patch patches/p.diff
+ > File sub/g added to patch patches/p.diff
+ > File sub/h added to patch patches/p.diff
- $ echo h1 > h
- $ rm -f g
+ $ rm -f sub/g
+ $ echo h1 > sub/h
$ quilt refresh
> Refreshed patch patches/p.diff
+ $ cd sub
+ $ echo f2 > f
$ quilt revert f
- > Changes to f in patch patches/p.diff reverted
+ > Changes to sub/f in patch ../patches/p.diff reverted
$ quilt diff -z
$ quilt pop -qf
- > Removing patch patches/p.diff
+ > Removing patch ../patches/p.diff
> No patches applied
$ quilt push -q
- > Applying patch patches/p.diff
- > Now at patch patches/p.diff
+ > Applying patch ../patches/p.diff
+ > Now at patch ../patches/p.diff
+ $ echo g2 > g
$ quilt revert g
- > Changes to g in patch patches/p.diff reverted
+ > Changes to sub/g in patch ../patches/p.diff reverted
$ quilt diff -z
$ quilt pop -qf
- > Removing patch patches/p.diff
+ > Removing patch ../patches/p.diff
> No patches applied
$ quilt push -q
- > Applying patch patches/p.diff
- > Now at patch patches/p.diff
+ > Applying patch ../patches/p.diff
+ > Now at patch ../patches/p.diff
+ $ echo h2 > h
$ quilt revert h
- > Changes to h in patch patches/p.diff reverted
+ > Changes to sub/h in patch ../patches/p.diff reverted
$ quilt diff -z
- $ cd ..
+ $ cd ../..
$ rm -rf d
diff --git a/test/revert2.test b/test/revert2.test
index af86a93..d1c6bd0 100644
--- a/test/revert2.test
+++ b/test/revert2.test
@@ -19,11 +19,12 @@
$ quilt refresh
> Refreshed patch patches/revert.patch
+ $ echo will-revert > bar
$ quilt revert bar
> Changes to bar in patch patches/revert.patch reverted
$ quilt refresh
- > Refreshed patch patches/revert.patch
+ > Patch patches/revert.patch is unchanged
$ cd ..
$ rm -rf d
diff --git a/test/snapshot.test b/test/snapshot.test
index 51a8913..1d73a93 100644
--- a/test/snapshot.test
+++ b/test/snapshot.test
@@ -21,9 +21,7 @@
$ quilt fork
> Fork of patch %{P}snapshot created as %{P}snapshot-2
- $ quilt revert g.txt
- > Changes to g.txt in patch patches/snapshot-2 reverted
-
+ $ rm g.txt
$ quilt add h.txt
> File h.txt added to patch %{P}snapshot-2
diff --git a/test/snapshot2.test b/test/snapshot2.test
index 8e1bc9e..b55ed7d 100644
--- a/test/snapshot2.test
+++ b/test/snapshot2.test
@@ -21,9 +21,7 @@
$ quilt fork
> Fork of patch %{_P}snapshot created as %{_P}snapshot-2
- $ quilt revert g.txt
- > Changes to d/g.txt in patch ../patches/snapshot-2 reverted
-
+ $ rm g.txt
$ quilt add h.txt
> File d/h.txt added to patch %{_P}snapshot-2
diff --git a/test/subdir.test b/test/subdir.test
index 7f2cac2..fa60b9c 100644
--- a/test/subdir.test
+++ b/test/subdir.test
@@ -63,12 +63,5 @@
$ quilt refresh
> Refreshed patch %{_P}test.patch
- $ quilt revert file2
- > Changes to subdir/file2 in patch ../patches/test.patch reverted
-
- $ quilt files
- > subdir/file
- > subdir/file3
-
$ cd ../..
$ rm -rf d