diff options
Diffstat (limited to 'test/two.test')
| -rw-r--r-- | test/two.test | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/test/two.test b/test/two.test index 4d48467..e365afe 100644 --- a/test/two.test +++ b/test/two.test @@ -5,18 +5,18 @@ $ mkdir dir $ echo "This is file one." > dir/file1 $ quilt new patch1.diff - > Patch patch1 is now on top + > Patch patch1.diff is now on top $ quilt add dir/file1 - > File d/dir/file1 added to patch patch1 + > File d/dir/file1 added to patch patch1.diff $ quilt add file2 - > File d/file2 added to patch patch1 + > File d/file2 added to patch patch1.diff $ quilt diff $ quilt diff -z $ quilt refresh - > Nothing in patch patch1 + > Nothing in patch patch1.diff $ echo "This is file two." > file2 $ quilt diff | sed -e "s/\\t.*//" @@ -36,7 +36,7 @@ > +This is file two. $ quilt refresh - > Refreshed patch patch1 + > Refreshed patch patch1.diff $ quilt diff -z $ echo "Another line has been added." >> dir/file1 @@ -50,7 +50,7 @@ > +Another line has been added. $ cd dir - $ quilt diff -z file1 + $ quilt diff -z file1 | sed -e "s/\\t.*//" > Index: d/d/dir/file1 > =================================================================== > --- d.orig/d/dir/file1 @@ -62,45 +62,45 @@ $ cd .. $ quilt refresh - > Refreshed patch patch1 + > Refreshed patch patch1.diff $ quilt new patch2.diff - > Patch patch2 is now on top + > Patch patch2.diff is now on top $ quilt add dir/file3 - > File d/dir/file3 added to patch patch2 + > File d/dir/file3 added to patch patch2.diff $ echo "This is file three." > dir/file3 $ quilt refresh - > Refreshed patch patch2 + > Refreshed patch patch2.diff $ quilt add -p patch1 dir/file3 - > File d/dir/file3 modified by patch patch2 + > File d/dir/file3 modified by patch patch2.diff $ quilt pop -R - > Removing patch2 + > Removing patch2.diff > Removing d/dir/file3 > - > Now at patch patch1 + > Now at patch patch1.diff $ quilt add file4 - > File d/file4 added to patch patch1 + > File d/file4 added to patch patch1.diff $ echo "This is file 4." > file4 $ quilt refresh - > Refreshed patch patch1 + > Refreshed patch patch1.diff $ quilt push - > Applying patch2 + > Applying patch2.diff > patching file d/dir/file3 > - > Now at patch patch2 + > Now at patch patch2.diff $ quilt new subdir/patch3.diff - > Patch subdir/patch3 is now on top + > Patch subdir/patch3.diff is now on top $ quilt add file4 - > File d/file4 added to patch subdir/patch3 + > File d/file4 added to patch subdir/patch3.diff $ rm file4 $ quilt diff | sed -e "s/\\t.*//" @@ -112,14 +112,14 @@ > -This is file 4. $ quilt add -p patch2 file4 - > File d/file4 modified by patch subdir/patch3 + > File d/file4 modified by patch subdir/patch3.diff $ quilt refresh - > Refreshed patch subdir/patch3 + > Refreshed patch subdir/patch3.diff $ echo "Another line here, too." >> dir/file3 $ quilt refresh patch2 - > Refreshed patch patch2 + > Refreshed patch patch2.diff $ echo "Another line added." >> file2 $ quilt diff -z -P patch1 | sed -e "s/\\t.*//" @@ -130,27 +130,27 @@ > @@ -1 +1,2 @@ > This is file two. > +Another line added. - > More recent patches modify files in patch1. + > More recent patches modify files in patch1.diff. $ quilt refresh patch1 - > More recent patches modify files in patch1. Enforce refresh with -f. + > More recent patches modify files in patch1.diff. Enforce refresh with -f. $ quilt refresh -f patch1 - > Refreshed patch patch1 + > Refreshed patch patch1.diff $ echo "Another line here, too." >> dir/file3 $ quilt pop -R - > Removing subdir/patch3 + > Removing subdir/patch3.diff > Restoring d/file4 > - > Now at patch patch2 + > Now at patch patch2.diff $ quilt refresh patch2 - > Refreshed patch patch2 + > Refreshed patch patch2.diff $ quilt pop -qaR - > Removing patch2 - > Removing patch1 + > Removing patch2.diff + > Removing patch1.diff > No patches applied $ cd ../.. |