Index: quilt/test/delete.test =================================================================== --- quilt.orig/test/delete.test 2006-01-21 19:21:48.000000000 +1100 +++ quilt/test/delete.test 2006-01-21 19:52:25.000000000 +1100 @@ -4,6 +4,9 @@ $ mkdir -p d/patches $ cd d + $ quilt delete + > No patches in series + $ cat > test.txt < Calling pci_match_id() would be more feasible. @@ -31,6 +34,9 @@ $ quilt refresh > Refreshed patch %{P}test2 + $ quilt delete test1 + > Patch %{P}test1 is currently applied + $ quilt pop > Removing patch %{P}test2 > Restoring test.txt @@ -58,5 +64,40 @@ $ quilt series + $ echo "test1" > %{P}series + $ quilt delete -n + > No patches applied + + $ quilt series + > %{P}test1 + + # Force the pop operaton to fail + $ echo "test3" > %{P}/series + $ echo "test3" > .pc/applied-patches + $ mkdir -p .pc/test3/dir + $ touch .pc/test3/dir/file + $ chmod a-rx .pc/test3/dir + + $ quilt delete "test3" + > Removing patch %{P}test3 + > .pc/test3/dir: Permission denied + > Patch %{P}test3 is currently applied + + $ chmod a+rx .pc/test3/dir + + $ find .pc/test3 + > .pc/test3 + > .pc/test3/dir + > .pc/test3/dir/file + + $ quilt applied + > No patches applied + + $ quilt series + > %{P}test3 + + $ quilt delete test3 + > Removed patch %{P}test3 + $ cd .. $ rm -rf d