diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2004-07-09 07:26:21 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2004-07-09 07:26:21 +0000 |
commit | e7bb642fdbcfa9bb1d7265781f56d89e398f90b9 (patch) | |
tree | 1ad9d16ce37e504ba72f9315c94ca9eb95597133 /test | |
parent | c871d820f8f00819613068aa77cb00d89e4508af (diff) | |
download | quilt-e7bb642fdbcfa9bb1d7265781f56d89e398f90b9.tar.gz |
- Switch from echo to printf for all translations: This is more
stable than having expansions in messages that might change
independent of the message.
- Add print_patch function and always use it when printing patch
names. Remove -n options from various scripts and use a global
switch QUILT_PATCHES_PREFIX in .quiltrc to decide between patch
names with and without directory prefix. Depending on user
experience this switch may eventually go away.
- Add --diffstat option to refresh command: If given, this option
inserts diffstat statistics at the end of the patch header, or
refreshes the existing diffstat output. No special tags in the
path file (%diffstat or the like) are needed.
- Minor fix inserting changelog into RPM specfile.
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile | 21 | ||||
-rw-r--r-- | test/comments.test | 45 | ||||
-rw-r--r-- | test/conflicts.test | 32 | ||||
-rw-r--r-- | test/example1.test | 22 | ||||
-rw-r--r-- | test/failpop.test | 8 | ||||
-rw-r--r-- | test/fold.test | 4 | ||||
-rw-r--r-- | test/formats.test | 4 | ||||
-rw-r--r-- | test/merge.test | 12 | ||||
-rw-r--r-- | test/new-nosubdir.test | 2 | ||||
-rw-r--r-- | test/new.test | 10 | ||||
-rw-r--r-- | test/one.test | 58 | ||||
-rw-r--r-- | test/reorder.test | 12 | ||||
-rw-r--r-- | test/snapshot.test | 16 | ||||
-rw-r--r-- | test/snapshot2.test | 16 | ||||
-rw-r--r-- | test/subdir.test | 14 | ||||
-rw-r--r-- | test/test.quiltrc | 2 | ||||
-rw-r--r-- | test/two.test | 58 |
17 files changed, 188 insertions, 148 deletions
diff --git a/test/Makefile b/test/Makefile index 16c34b4..86a3031 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,10 +1,15 @@ -TESTS=$(wildcard *.test) +TESTS=$(shell ls -tr *.test) -all: $(patsubst %,_test_%,$(TESTS)) +export QUILTRC=$(CURDIR)/test.quiltrc +ifneq ($(shell source $(QUILTRC) ; echo $$QUILT_PATCHES_PREFIX),) +export P=patches/ +endif +$(warning P=$(P)) -.PHONY: $(patsubst %,_test_%,$(TESTS)) -$(patsubst %,_test_%,$(TESTS)): - @test=$(patsubst _test_%,%,$@); \ - echo "[$$test]" ; \ - export QUILTRC=$(CURDIR)/test.quiltrc ; \ - ./run $$test +all: $(TESTS) + +.PHONY: $(TESTS) + +$(TESTS): + @echo "[$@]" + @./run $@ diff --git a/test/comments.test b/test/comments.test index 680414b..0918443 100644 --- a/test/comments.test +++ b/test/comments.test @@ -12,8 +12,8 @@ accidentally removed. < < Index: f < =================================================================== - < --- f.orig 2003-04-09 03:18:06.000000000 +0200 - < +++ f 2003-04-09 03:18:09.000000000 +0200 + < --- f.orig foo + < +++ f bar < @@ -1 +1 @@ < -one < +two @@ -22,14 +22,14 @@ accidentally removed. < test.diff -p0 $ quilt push - > Applying test.diff + > Applying patch %{P}test.diff > patching file f > - > Now at patch test.diff + > Now at patch %{P}test.diff $ quilt refresh - > Refreshed patch test.diff - $ sed -e "s/\\t.*//" patches/test.diff + > Refreshed patch %{P}test.diff + $ cat patches/test.diff > C1 > > C3 @@ -42,6 +42,39 @@ accidentally removed. > -one > +two + $ quilt refresh -c + > Refreshed patch %{P}test.diff + + $ cat patches/test.diff + > C1 + > + > C3 + > + > Index: f + > =================================================================== + > *** f.orig + > --- f + > *************** + > *** 1 **** + > ! one + > --- 1 ---- + > ! two + + $ quilt refresh + > Refreshed patch %{P}test.diff + + $ cat patches/test.diff + > C1 + > + > C3 + > + > Index: f + > =================================================================== + > --- f.orig + > +++ f + > @@ -1 +1 @@ + > -one + > +two $ cd .. $ rm -rf d diff --git a/test/conflicts.test b/test/conflicts.test index 0581fbd..fe250e8 100644 --- a/test/conflicts.test +++ b/test/conflicts.test @@ -23,50 +23,50 @@ anymore, then the patch is fixed. < g $ quilt new a.diff - > Patch a.diff is now on top + > Patch %{P}a.diff is now on top $ quilt add one.txt - > File one.txt added to patch a.diff + > File one.txt added to patch %{P}a.diff $ mv one.txt one.orig $ sed -e "s/4/4+/" -e 's/d/d+/' one.orig > one.txt $ quilt refresh - > Refreshed patch a.diff + > Refreshed patch %{P}a.diff $ quilt pop -q - > Removing a.diff + > Removing patch %{P}a.diff > No patches applied $ sed -e "s/^\\([17]\\)\$/\\1-/" one.orig > one.txt $ quilt push -q - > Applying a.diff - > Now at patch a.diff + > Applying patch %{P}a.diff + > Now at patch %{P}a.diff $ quilt pop -q - > Removing a.diff + > Removing patch %{P}a.diff > No patches applied $ sed -e "s/^\\([1267]\\)\$/\\1-/" one.orig > one.txt $ quilt push -q - > Applying a.diff - > Now at patch a.diff + > Applying patch %{P}a.diff + > Now at patch %{P}a.diff $ quilt pop -q - > Removing a.diff + > Removing patch %{P}a.diff > No patches applied $ sed -e "s/^\\([123567]\\)\$/\\1-/" one.orig > one.txt $ quilt push -q - > Applying a.diff + > Applying patch %{P}a.diff > 1 out of 2 hunks FAILED -- rejects in file one.txt - > Patch a.diff does not apply (enforce with -f) + > Patch %{P}a.diff does not apply (enforce with -f) $ quilt push -qf - > Applying a.diff + > Applying patch %{P}a.diff > 1 out of 2 hunks FAILED -- saving rejects to file one.txt.rej - > Applied a.diff (forced; needs refresh) + > Applied patch %{P}a.diff (forced; needs refresh) $ mv one.txt one.x $ sed -e "s/4/4+/" one.x > one.txt @@ -107,7 +107,7 @@ anymore, then the patch is fixed. > g $ quilt refresh - > Refreshed patch a.diff + > Refreshed patch %{P}a.diff $ cat patches/a.diff | grep -v "^\\(---\\|+++\\)" > Index: d/one.txt @@ -132,7 +132,7 @@ anymore, then the patch is fixed. > g $ quilt pop -q - > Removing a.diff + > Removing patch %{P}a.diff > No patches applied $ cd .. 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: diff --git a/test/failpop.test b/test/failpop.test index 57c3daa..9cd3ed0 100644 --- a/test/failpop.test +++ b/test/failpop.test @@ -5,23 +5,23 @@ < This is test.txt. $ quilt new test.diff - > Patch test.diff is now on top + > Patch %{P}test.diff is now on top $ quilt add test.txt - > File test.txt added to patch test.diff + > File test.txt added to patch %{P}test.diff $ cat >> test.txt < Line two. $ quilt refresh - > Refreshed patch test.diff + > Refreshed patch %{P}test.diff $ sleep 2 $ sed -e "s/ /_/g" patches/test.diff > patches/test.new $ mv patches/test.new patches/test.diff $ quilt pop - > Patch test.diff does not remove cleanly (enforce with -f). + > Patch %{P}test.diff does not remove cleanly (enforce with -f) $ cd .. $ rm -rf d diff --git a/test/fold.test b/test/fold.test index 331138a..cdd2e5d 100644 --- a/test/fold.test +++ b/test/fold.test @@ -27,8 +27,8 @@ < +This is file3.txt. $ quilt push -q - > Applying patch1.diff - > Now at patch patch1.diff + > Applying patch %{P}patch1.diff + > Now at patch %{P}patch1.diff $ quilt files > file1.txt diff --git a/test/formats.test b/test/formats.test index a91f277..bcb6c82 100644 --- a/test/formats.test +++ b/test/formats.test @@ -9,10 +9,10 @@ < 5 $ quilt new test - > Patch test is now on top + > Patch %{P}test is now on top $ quilt add test.txt - > File test.txt added to patch test + > File test.txt added to patch %{P}test $ cat > test.txt < 1 diff --git a/test/merge.test b/test/merge.test index 21799cd..aaa9da8 100644 --- a/test/merge.test +++ b/test/merge.test @@ -36,12 +36,13 @@ Test the patch merging functionality of `quilt diff'. < +c+ $ quilt push -qa - > Applying a.diff - > Applying b.diff - > Applying c.diff - > Now at patch c.diff + > Applying patch %{P}a.diff + > Applying patch %{P}b.diff + > Applying patch %{P}c.diff + > Now at patch %{P}c.diff $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)" + > More recent patches modify files in patch %{P}b.diff > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ @@ -49,9 +50,9 @@ Test the patch merging functionality of `quilt diff'. > -b > +b+ > c - > More recent patches modify files in b.diff. $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" + > More recent patches modify files in patch %{P}b.diff > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ @@ -60,7 +61,6 @@ Test the patch merging functionality of `quilt diff'. > +a+ > +b+ > c - > More recent patches modify files in b.diff. $ quilt diff --combine b.diff | grep -v "^\\(---\\|+++\\)" > Index: d/abc.txt diff --git a/test/new-nosubdir.test b/test/new-nosubdir.test index 7df94cc..ab3f854 100644 --- a/test/new-nosubdir.test +++ b/test/new-nosubdir.test @@ -5,7 +5,7 @@ $ cd sub $ quilt new here.diff > Warning: directory ../patches exists; ignoring - > Patch here.diff is now on top + > Patch %{P}here.diff is now on top $ cd ../.. $ rm -rf d diff --git a/test/new.test b/test/new.test index e46bba1..1ca7cad 100644 --- a/test/new.test +++ b/test/new.test @@ -16,24 +16,24 @@ $ quilt push - > Applying p.diff + > Applying patch %{P}p.diff > patching file f > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- rejects in file f > patching file g - > Patch p.diff does not apply (enforce with -f) + > Patch %{P}p.diff does not apply (enforce with -f) $ quilt push -f - > Applying p.diff + > Applying patch %{P}p.diff > patching file f > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file f.rej > patching file g - > Applied p.diff (forced; needs refresh) + > Applied patch %{P}p.diff (forced; needs refresh) $ echo new > f $ quilt refresh - > Refreshed patch p.diff + > Refreshed patch %{P}p.diff $ cat patches/p.diff | sed -e "s/\\t.*//" > Index: d/f > =================================================================== diff --git a/test/one.test b/test/one.test index 6d92dcb..0bf0b70 100644 --- a/test/one.test +++ b/test/one.test @@ -10,18 +10,18 @@ of the installed quilt with `make check'. $ mkdir dir $ echo "This is file one." > dir/file1 $ quilt new patch1.diff - > Patch patch1.diff is now on top + > Patch %{P}patch1.diff is now on top $ quilt add dir/file1 - > File dir/file1 added to patch patch1.diff + > File dir/file1 added to patch %{P}patch1.diff $ quilt add file2 - > File file2 added to patch patch1.diff + > File file2 added to patch %{P}patch1.diff $ quilt diff $ quilt diff -z $ quilt refresh - > Nothing in patch patch1.diff + > Nothing in patch %{P}patch1.diff $ echo "This is file two." > file2 $ quilt diff | sed -e "s/\\t.*//" @@ -41,7 +41,7 @@ of the installed quilt with `make check'. > +This is file two. $ quilt refresh - > Refreshed patch patch1.diff + > Refreshed patch %{P}patch1.diff $ quilt diff -z $ echo "Another line has been added." >> dir/file1 @@ -64,45 +64,45 @@ of the installed quilt with `make check'. > +Another line has been added. $ quilt refresh - > Refreshed patch patch1.diff + > Refreshed patch %{P}patch1.diff $ quilt new patch2.diff - > Patch patch2.diff is now on top + > Patch %{P}patch2.diff is now on top $ quilt add dir/file3 - > File dir/file3 added to patch patch2.diff + > File dir/file3 added to patch %{P}patch2.diff $ echo "This is file three." > dir/file3 $ quilt refresh - > Refreshed patch patch2.diff + > Refreshed patch %{P}patch2.diff $ quilt add -p patch1 dir/file3 - > File dir/file3 modified by patch patch2.diff + > File dir/file3 modified by patch %{P}patch2.diff $ quilt pop -R - > Removing patch2.diff + > Removing patch %{P}patch2.diff > Removing dir/file3 > - > Now at patch patch1.diff + > Now at patch %{P}patch1.diff $ quilt add file4 - > File file4 added to patch patch1.diff + > File file4 added to patch %{P}patch1.diff $ echo "This is file 4." > file4 $ quilt refresh - > Refreshed patch patch1.diff + > Refreshed patch %{P}patch1.diff $ quilt push - > Applying patch2.diff + > Applying patch %{P}patch2.diff > patching file dir/file3 > - > Now at patch patch2.diff + > Now at patch %{P}patch2.diff $ quilt new subdir/patch3.diff - > Patch subdir/patch3.diff is now on top + > Patch %{P}subdir/patch3.diff is now on top $ quilt add file4 - > File file4 added to patch subdir/patch3.diff + > File file4 added to patch %{P}subdir/patch3.diff $ rm file4 $ quilt diff | sed -e "s/\\t.*//" @@ -114,17 +114,18 @@ of the installed quilt with `make check'. > -This is file 4. $ quilt add -p patch2 file4 - > File file4 modified by patch subdir/patch3.diff + > File file4 modified by patch %{P}subdir/patch3.diff $ quilt refresh - > Refreshed patch subdir/patch3.diff + > Refreshed patch %{P}subdir/patch3.diff $ echo "Another line here, too." >> dir/file3 $ quilt refresh patch2 - > Refreshed patch patch2.diff + > Refreshed patch %{P}patch2.diff $ echo "Another line added." >> file2 $ quilt diff -z -P patch1 | sed -e "s/\\t.*//" + > More recent patches modify files in patch %{P}patch1.diff > Index: d/file2 > =================================================================== > --- d.orig/file2 @@ -132,27 +133,26 @@ of the installed quilt with `make check'. > @@ -1 +1,2 @@ > This is file two. > +Another line added. - > More recent patches modify files in patch1.diff. $ quilt refresh patch1 - > More recent patches modify files in patch1.diff. Enforce refresh with -f. + > More recent patches modify files in patch %{P}patch1.diff. Enforce refresh with -f. $ quilt refresh -f patch1 - > Refreshed patch patch1.diff + > Refreshed patch %{P}patch1.diff $ echo "Another line here, too." >> dir/file3 $ quilt pop -R - > Removing subdir/patch3.diff + > Removing patch %{P}subdir/patch3.diff > Restoring file4 > - > Now at patch patch2.diff + > Now at patch %{P}patch2.diff $ quilt refresh patch2 - > Refreshed patch patch2.diff + > Refreshed patch %{P}patch2.diff $ quilt pop -qaR - > Removing patch2.diff - > Removing patch1.diff + > Removing patch %{P}patch2.diff + > Removing patch %{P}patch1.diff > No patches applied $ cd .. diff --git a/test/reorder.test b/test/reorder.test index 8e45572..9fbb12d 100644 --- a/test/reorder.test +++ b/test/reorder.test @@ -21,11 +21,11 @@ Regression test: Quilt did reorder files in patches. < test.diff -p0 $ quilt push -q - > Applying test.diff - > Now at patch test.diff + > Applying patch %{P}test.diff + > Now at patch %{P}test.diff $ quilt pop -q - > Removing test.diff + > Removing patch %{P}test.diff > No patches applied $ echo one > h @@ -37,8 +37,8 @@ Regression test: Quilt did reorder files in patches. < +two $ quilt push -q - > Applying test.diff - > Now at patch test.diff + > Applying patch %{P}test.diff + > Now at patch %{P}test.diff $ quilt files > g @@ -51,7 +51,7 @@ Regression test: Quilt did reorder files in patches. > +++ h $ quilt refresh - > Refreshed patch test.diff + > Refreshed patch %{P}test.diff $ grep "^+++ " patches/test.diff > +++ g > +++ f diff --git a/test/snapshot.test b/test/snapshot.test index f70003e..9d8dce9 100644 --- a/test/snapshot.test +++ b/test/snapshot.test @@ -2,29 +2,29 @@ $ cd d $ quilt new snapshot - > Patch snapshot is now on top + > Patch %{P}snapshot is now on top $ quilt add f.txt - > File f.txt added to patch snapshot + > File f.txt added to patch %{P}snapshot $ cat > f.txt < f.txt $ quilt add g.txt - > File g.txt added to patch snapshot + > File g.txt added to patch %{P}snapshot $ cat > g.txt < g.txt $ quilt refresh - > Refreshed patch snapshot + > Refreshed patch %{P}snapshot $ quilt snapshot $ quilt fork - > Fork of snapshot created as snapshot-2 + > Fork of patch %{P}snapshot created as %{P}snapshot-2 $ quilt remove g.txt - > File g.txt removed from patch snapshot-2 + > File g.txt removed from patch %{P}snapshot-2 $ quilt add h.txt - > File h.txt added to patch snapshot-2 + > File h.txt added to patch %{P}snapshot-2 $ cat > h.txt < h.txt @@ -33,7 +33,7 @@ < more changes $ quilt refresh - > Refreshed patch snapshot-2 + > Refreshed patch %{P}snapshot-2 $ quilt diff --snapshot | grep -v "^\\(---\\|+++\\)" > Index: d/f.txt diff --git a/test/snapshot2.test b/test/snapshot2.test index 0f993cc..238d8c5 100644 --- a/test/snapshot2.test +++ b/test/snapshot2.test @@ -1,30 +1,30 @@ $ mkdir -p d/d $ cd d $ quilt new snapshot - > Patch snapshot is now on top + > Patch %{P}snapshot is now on top $ cd d $ quilt add f.txt - > File d/f.txt added to patch snapshot + > File d/f.txt added to patch %{P}snapshot $ cat > f.txt < f.txt $ quilt add g.txt - > File d/g.txt added to patch snapshot + > File d/g.txt added to patch %{P}snapshot $ cat > g.txt < g.txt $ quilt refresh - > Refreshed patch snapshot + > Refreshed patch %{P}snapshot $ quilt snapshot $ quilt fork - > Fork of snapshot created as snapshot-2 + > Fork of patch %{P}snapshot created as %{P}snapshot-2 $ quilt remove g.txt - > File d/g.txt removed from patch snapshot-2 + > File d/g.txt removed from patch %{P}snapshot-2 $ quilt add h.txt - > File d/h.txt added to patch snapshot-2 + > File d/h.txt added to patch %{P}snapshot-2 $ cat > h.txt < h.txt @@ -33,7 +33,7 @@ < more changes $ quilt refresh - > Refreshed patch snapshot-2 + > Refreshed patch %{P}snapshot-2 $ quilt diff --snapshot | grep -v "^\\(---\\|+++\\)" > Index: d/d/f.txt diff --git a/test/subdir.test b/test/subdir.test index e4334d5..46ac36e 100644 --- a/test/subdir.test +++ b/test/subdir.test @@ -6,10 +6,10 @@ < old file $ quilt new test.patch - > Patch test.patch is now on top + > Patch %{P}test.patch is now on top $ quilt add subdir/file - > File subdir/file added to patch test.patch + > File subdir/file added to patch %{P}test.patch $ cat > subdir/file < new contents @@ -17,11 +17,11 @@ This creates the patches/ directory: $ quilt refresh - > Refreshed patch test.patch + > Refreshed patch %{P}test.patch $ cd subdir $ quilt add file2 - > File subdir/file2 added to patch test.patch + > File subdir/file2 added to patch %{P}test.patch $ cat > file2 < another file @@ -30,7 +30,7 @@ < yet another file $ quilt add file3 - > File subdir/file3 added to patch test.patch + > File subdir/file3 added to patch %{P}test.patch $ rm file3 $ quilt files @@ -60,10 +60,10 @@ > -yet another file $ quilt refresh - > Refreshed patch test.patch + > Refreshed patch %{P}test.patch $ quilt remove file2 - > File subdir/file2 removed from patch test.patch + > File subdir/file2 removed from patch %{P}test.patch $ quilt files > subdir/file diff --git a/test/test.quiltrc b/test/test.quiltrc index ba458a6..b656eea 100644 --- a/test/test.quiltrc +++ b/test/test.quiltrc @@ -1,3 +1,5 @@ # Define this to generate diffs without timestamps. QUILT_DIFF_ARGS="--no-timestamps" QUILT_REFRESH_ARGS="--no-timestamps" + +QUILT_PATCHES_PREFIX=yes diff --git a/test/two.test b/test/two.test index bbacbae..b29e69b 100644 --- a/test/two.test +++ b/test/two.test @@ -3,21 +3,21 @@ $ mkdir -p d/d $ cd d $ quilt new patch1.diff - > Patch patch1.diff is now on top + > Patch %{P}patch1.diff is now on top $ cd d $ mkdir dir $ echo "This is file one." > dir/file1 $ quilt add dir/file1 - > File d/dir/file1 added to patch patch1.diff + > File d/dir/file1 added to patch %{P}patch1.diff $ quilt add file2 - > File d/file2 added to patch patch1.diff + > File d/file2 added to patch %{P}patch1.diff $ quilt diff $ quilt diff -z $ quilt refresh - > Nothing in patch patch1.diff + > Nothing in patch %{P}patch1.diff $ echo "This is file two." > file2 $ quilt diff | sed -e "s/\\t.*//" @@ -37,7 +37,7 @@ > +This is file two. $ quilt refresh - > Refreshed patch patch1.diff + > Refreshed patch %{P}patch1.diff $ quilt diff -z $ echo "Another line has been added." >> dir/file1 @@ -63,49 +63,49 @@ $ cd .. $ quilt refresh - > Refreshed patch patch1.diff + > Refreshed patch %{P}patch1.diff $ cd .. $ quilt new patch2.diff - > Patch patch2.diff is now on top + > Patch %{P}patch2.diff is now on top $ cd d $ quilt add dir/file3 - > File d/dir/file3 added to patch patch2.diff + > File d/dir/file3 added to patch %{P}patch2.diff $ echo "This is file three." > dir/file3 $ quilt refresh - > Refreshed patch patch2.diff + > Refreshed patch %{P}patch2.diff $ quilt add -p patch1 dir/file3 - > File d/dir/file3 modified by patch patch2.diff + > File d/dir/file3 modified by patch %{P}patch2.diff $ quilt pop -R - > Removing patch2.diff + > Removing patch %{P}patch2.diff > Removing d/dir/file3 > - > Now at patch patch1.diff + > Now at patch %{P}patch1.diff $ quilt add file4 - > File d/file4 added to patch patch1.diff + > File d/file4 added to patch %{P}patch1.diff $ echo "This is file 4." > file4 $ quilt refresh - > Refreshed patch patch1.diff + > Refreshed patch %{P}patch1.diff $ quilt push - > Applying patch2.diff + > Applying patch %{P}patch2.diff > patching file d/dir/file3 > - > Now at patch patch2.diff + > Now at patch %{P}patch2.diff $ cd .. $ quilt new subdir/patch3.diff - > Patch subdir/patch3.diff is now on top + > Patch %{P}subdir/patch3.diff is now on top $ cd d $ quilt add file4 - > File d/file4 added to patch subdir/patch3.diff + > File d/file4 added to patch %{P}subdir/patch3.diff $ rm file4 $ quilt diff | sed -e "s/\\t.*//" @@ -117,17 +117,18 @@ > -This is file 4. $ quilt add -p patch2 file4 - > File d/file4 modified by patch subdir/patch3.diff + > File d/file4 modified by patch %{P}subdir/patch3.diff $ quilt refresh - > Refreshed patch subdir/patch3.diff + > Refreshed patch %{P}subdir/patch3.diff $ echo "Another line here, too." >> dir/file3 $ quilt refresh patch2 - > Refreshed patch patch2.diff + > Refreshed patch %{P}patch2.diff $ echo "Another line added." >> file2 $ quilt diff -z -P patch1 | sed -e "s/\\t.*//" + > More recent patches modify files in patch %{P}patch1.diff > Index: d/d/file2 > =================================================================== > --- d.orig/d/file2 @@ -135,27 +136,26 @@ > @@ -1 +1,2 @@ > This is file two. > +Another line added. - > More recent patches modify files in patch1.diff. $ quilt refresh patch1 - > More recent patches modify files in patch1.diff. Enforce refresh with -f. + > More recent patches modify files in patch %{P}patch1.diff. Enforce refresh with -f. $ quilt refresh -f patch1 - > Refreshed patch patch1.diff + > Refreshed patch %{P}patch1.diff $ echo "Another line here, too." >> dir/file3 $ quilt pop -R - > Removing subdir/patch3.diff + > Removing patch %{P}subdir/patch3.diff > Restoring d/file4 > - > Now at patch patch2.diff + > Now at patch %{P}patch2.diff $ quilt refresh patch2 - > Refreshed patch patch2.diff + > Refreshed patch %{P}patch2.diff $ quilt pop -qaR - > Removing patch2.diff - > Removing patch1.diff + > Removing patch %{P}patch2.diff + > Removing patch %{P}patch1.diff > No patches applied $ cd ../.. |