diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/perms.test | 4 | ||||
| -rw-r--r-- | test/remove2.test | 29 | ||||
| -rw-r--r-- | test/revert.test (renamed from test/remove.test) | 12 | ||||
| -rw-r--r-- | test/revert2.test | 29 | ||||
| -rw-r--r-- | test/snapshot.test | 4 | ||||
| -rw-r--r-- | test/snapshot2.test | 4 | ||||
| -rw-r--r-- | test/subdir.test | 4 | ||||
| -rw-r--r-- | test/three.test | 2 |
8 files changed, 44 insertions, 44 deletions
diff --git a/test/perms.test b/test/perms.test index 501eb7d..29c3cfe 100644 --- a/test/perms.test +++ b/test/perms.test @@ -56,8 +56,8 @@ the backup file. > Removing patch %{P}test2.diff > Now at patch %{P}test.diff - $ quilt remove foo - > File foo removed from 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 diff --git a/test/remove2.test b/test/remove2.test deleted file mode 100644 index 8d99910..0000000 --- a/test/remove2.test +++ /dev/null @@ -1,29 +0,0 @@ - $ rm -rf d - $ mkdir -p d/patches - $ cd d - - $ quilt new remove.patch - > Patch patches/remove.patch is now on top - - $ quilt add foo bar baz - > File foo added to patch patches/remove.patch - > File bar added to patch patches/remove.patch - > File baz added to patch patches/remove.patch - - $ echo foo > foo - $ echo bar > bar - $ echo baz > baz - $ quilt remove baz - > File baz removed from patch patches/remove.patch - - $ quilt refresh - > Refreshed patch patches/remove.patch - - $ quilt remove bar - > File bar removed from patch patches/remove.patch - - $ quilt refresh - > Refreshed patch patches/remove.patch - - $ cd .. - $ rm -rf d diff --git a/test/remove.test b/test/revert.test index 06c2f9c..cf7eae6 100644 --- a/test/remove.test +++ b/test/revert.test @@ -17,8 +17,8 @@ $ quilt refresh > Refreshed patch patches/p.diff - $ quilt remove f - > File f removed from patch patches/p.diff + $ quilt revert f + > Changes to f in patch patches/p.diff reverted $ quilt diff -z $ quilt pop -qf @@ -29,8 +29,8 @@ > Applying patch patches/p.diff > Now at patch patches/p.diff - $ quilt remove g - > File g removed from patch patches/p.diff + $ quilt revert g + > Changes to g in patch patches/p.diff reverted $ quilt diff -z $ quilt pop -qf @@ -41,8 +41,8 @@ > Applying patch patches/p.diff > Now at patch patches/p.diff - $ quilt remove h - > File h removed from patch patches/p.diff + $ quilt revert h + > Changes to h in patch patches/p.diff reverted $ quilt diff -z diff --git a/test/revert2.test b/test/revert2.test new file mode 100644 index 0000000..af86a93 --- /dev/null +++ b/test/revert2.test @@ -0,0 +1,29 @@ + $ rm -rf d + $ mkdir -p d/patches + $ cd d + + $ quilt new revert.patch + > Patch patches/revert.patch is now on top + + $ quilt add foo bar baz + > File foo added to patch patches/revert.patch + > File bar added to patch patches/revert.patch + > File baz added to patch patches/revert.patch + + $ echo foo > foo + $ echo bar > bar + $ echo baz > baz + $ quilt revert baz + > Changes to baz in patch patches/revert.patch reverted + + $ quilt refresh + > Refreshed patch patches/revert.patch + + $ quilt revert bar + > Changes to bar in patch patches/revert.patch reverted + + $ quilt refresh + > Refreshed patch patches/revert.patch + + $ cd .. + $ rm -rf d diff --git a/test/snapshot.test b/test/snapshot.test index f711066..51a8913 100644 --- a/test/snapshot.test +++ b/test/snapshot.test @@ -21,8 +21,8 @@ $ quilt fork > Fork of patch %{P}snapshot created as %{P}snapshot-2 - $ quilt remove g.txt - > File g.txt removed from patch %{P}snapshot-2 + $ quilt revert g.txt + > Changes to g.txt in patch patches/snapshot-2 reverted $ quilt add h.txt > File h.txt added to patch %{P}snapshot-2 diff --git a/test/snapshot2.test b/test/snapshot2.test index 0e25d79..8e1bc9e 100644 --- a/test/snapshot2.test +++ b/test/snapshot2.test @@ -21,8 +21,8 @@ $ quilt fork > Fork of patch %{_P}snapshot created as %{_P}snapshot-2 - $ quilt remove g.txt - > File d/g.txt removed from patch %{_P}snapshot-2 + $ quilt revert g.txt + > Changes to d/g.txt in patch ../patches/snapshot-2 reverted $ 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 ead1a22..7f2cac2 100644 --- a/test/subdir.test +++ b/test/subdir.test @@ -63,8 +63,8 @@ $ quilt refresh > Refreshed patch %{_P}test.patch - $ quilt remove file2 - > File subdir/file2 removed from patch %{_P}test.patch + $ quilt revert file2 + > Changes to subdir/file2 in patch ../patches/test.patch reverted $ quilt files > subdir/file diff --git a/test/three.test b/test/three.test index 632a089..ca90e07 100644 --- a/test/three.test +++ b/test/three.test @@ -120,7 +120,7 @@ $ quilt unapplied patch1 > patches/patch2.diff - $ quilt remove f + $ quilt revert f > No patches applied $ quilt delete patch3.diff |