diff options
Diffstat (limited to 'test/revert.test')
| -rw-r--r-- | test/revert.test | 41 |
1 files changed, 23 insertions, 18 deletions
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 |