diff options
Diffstat (limited to 'test/example1.test')
| -rw-r--r-- | test/example1.test | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/example1.test b/test/example1.test index 031f334..f209d3d 100644 --- a/test/example1.test +++ b/test/example1.test @@ -10,10 +10,10 @@ http://the-tech.mit.edu/Shakespeare/midsummer/full.html < And girls call it love-in-idleness. $ quilt new flower.diff - > Patch flower.diff is now on top + > Patch %{P}flower.diff is now on top $ quilt add Oberon.txt - > File Oberon.txt added to patch flower.diff + > File Oberon.txt added to patch %{P}flower.diff $ cat >> Oberon.txt < The juice of it on sleeping eye-lids laid @@ -23,7 +23,7 @@ http://the-tech.mit.edu/Shakespeare/midsummer/full.html Or ``quilt edit Oberon.txt'' $ quilt refresh - > Refreshed patch flower.diff + > Refreshed patch %{P}flower.diff $ cat patches/flower.diff | sed -e "s/\\t.*//" > Index: example1/Oberon.txt @@ -69,10 +69,10 @@ Or ``quilt edit Oberon.txt'' > +Upon the next live creature that it sees. $ quilt refresh - > Refreshed patch flower.diff + > Refreshed patch %{P}flower.diff $ quilt top - > flower.diff + > %{P}flower.diff $ quilt files > Oberon.txt @@ -80,7 +80,7 @@ Or ``quilt edit Oberon.txt'' $ quilt patches Oberon.txt > flower.diff $ quilt pop -f - > Removing flower.diff + > Removing patch %{P}flower.diff > Restoring Oberon.txt > > No patches applied @@ -88,18 +88,18 @@ Or ``quilt edit Oberon.txt'' $ sed -e "s/girls/maidens/" Oberon.txt > Oberon.new $ mv Oberon.new Oberon.txt $ quilt push - > Applying flower.diff + > Applying patch %{P}flower.diff > patching file Oberon.txt > Hunk #1 FAILED at 2. > 1 out of 1 hunk FAILED -- rejects in file Oberon.txt - > Patch flower.diff does not apply (enforce with -f) + > Patch %{P}flower.diff does not apply (enforce with -f) $ quilt push -f - > Applying flower.diff + > Applying patch %{P}flower.diff > patching file Oberon.txt > Hunk #1 FAILED at 2. > 1 out of 1 hunk FAILED -- saving rejects to file Oberon.txt.rej - > Applied flower.diff (forced; needs refresh) + > Applied patch %{P}flower.diff (forced; needs refresh) $ cat >> Oberon.txt < Fetch me that flower; the herb I shew'd thee once: @@ -108,7 +108,7 @@ Or ``quilt edit Oberon.txt'' < Upon the next live creature that it sees. $ quilt refresh - > Refreshed patch flower.diff + > Refreshed patch %{P}flower.diff $ cat Oberon.txt > Yet mark'd I where the bolt of Cupid fell: |