diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2004-02-20 14:30:45 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2004-02-20 14:30:45 +0000 |
| commit | bd0773bed9c43affd7f0af8b04fa9850bdd588b2 (patch) | |
| tree | 381c147a8a42ed8f595c0446f8f67fcb31e29ad8 /test/reorder.test | |
| parent | 2e083b83410563b1bc5ff8b2379315178ccc7bfd (diff) | |
| download | quilt-bd0773bed9c43affd7f0af8b04fa9850bdd588b2.tar.gz | |
- Sub-directory support:
+ Fix another bug that triggers when /patches exists.
+ Working in sub-directories: Force `quilt new' to always create
the new patch in the current working directory even if there
is a patches/ sub-directory further up the directory tree.
This should restore the behavior from before Jan 28 very well.
- quilt files, diff, refresh: Sort the files in the patch
alphabetically.
Diffstat (limited to 'test/reorder.test')
| -rw-r--r-- | test/reorder.test | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/test/reorder.test b/test/reorder.test index 154e2e9..b592932 100644 --- a/test/reorder.test +++ b/test/reorder.test @@ -6,13 +6,13 @@ Regression test: Quilt did reorder files in patches. $ echo one > g $ mkdir patches $ cat > patches/test.diff - < --- g.orig 2003-04-09 01:48:01.000000000 +0200 - < +++ g 2003-04-09 01:49:17.000000000 +0200 + < --- g.orig + < +++ g < @@ -1 +1 @@ < -one < +two - < --- f.orig 2003-04-09 01:48:01.000000000 +0200 - < +++ f 2003-04-09 01:49:17.000000000 +0200 + < --- f.orig + < +++ f < @@ -1 +1 @@ < -one < +two @@ -30,8 +30,8 @@ Regression test: Quilt did reorder files in patches. $ echo one > h $ sleep 2 $ cat >> patches/test.diff - < --- h.orig 2003-04-09 01:48:01.000000000 +0200 - < +++ h 2003-04-09 01:49:17.000000000 +0200 + < --- h.orig + < +++ h < @@ -1 +1 @@ < -one < +two @@ -41,9 +41,16 @@ Regression test: Quilt did reorder files in patches. > Now at patch test.diff $ quilt files - > g > f + > g > h + $ quilt refresh + > Refreshed patch test.diff + $ grep "^+++ " patches/test.diff + > +++ f + > +++ g + > +++ h + $ cd .. $ rm -rf d |