diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 20:06:52 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 20:06:52 +0000 |
| commit | 3ea7e41383a9e9ce1fe41a28822944bff469aa02 (patch) | |
| tree | bc4e3a03fa6ba2f1d6974a84e09feaa37bd91934 /test | |
| parent | 3a6c8c1edcac481e7a13cf9c976edd17a4c92219 (diff) | |
| download | quilt-3ea7e41383a9e9ce1fe41a28822944bff469aa02.tar.gz | |
- Split off strip_diffstat from header command.
- import command: compare patch headers to prevent destruction;
add -d option to choose which header(s) to keep.
Diffstat (limited to 'test')
| -rw-r--r-- | test/import.test | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/test/import.test b/test/import.test index 7820b06..3f7ebfc 100644 --- a/test/import.test +++ b/test/import.test @@ -81,17 +81,35 @@ # a simple use of import + $ quilt import t/patch1.diff + > Patch patches/patch1.diff exists. Replace with -f. + + $ quilt import -f t/patch1.diff + > Replacing patch patches/patch1.diff with new version + + # an import requiring a description merge $ sed -e 's/original/new/' patches/patch1.diff > t/patch1.diff $ quilt import t/patch1.diff > Patch patches/patch1.diff exists. Replace with -f. $ quilt import -f t/patch1.diff + > Patch headers differ: + > @@ -1 +1 @@ + > -original description + > +new description + > Please use -d {o|a|n} to specify which patch header(s) to keep. + + $ quilt import -d a -f t/patch1.diff > Replacing patch patches/patch1.diff with new version - $ ls patches/ - > patch1.diff - > patch2.diff - > series + # quilt header does not work in this case because it stops at '---' + $ head -n 3 patches/patch1.diff + > original description + > --- + > new description + + $ quilt import -d n -f t/patch1.diff + > Replacing patch patches/patch1.diff with new version $ quilt header patch1 > new description |