diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 18:46:54 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 18:46:54 +0000 |
| commit | 3a6c8c1edcac481e7a13cf9c976edd17a4c92219 (patch) | |
| tree | f916c66195d7d3f740cb86357e3e23d8900f8c41 /test | |
| parent | 92401e6ef4284e7228be4faff2915a7d210d3897 (diff) | |
| download | quilt-3a6c8c1edcac481e7a13cf9c976edd17a4c92219.tar.gz | |
- import command: catch several error conditions. Patches in
QUILT_PATCHES can now e imported. A minor fix in the output.
Diffstat (limited to 'test')
| -rw-r--r-- | test/import.test | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/test/import.test b/test/import.test index 000b8ca..7820b06 100644 --- a/test/import.test +++ b/test/import.test @@ -27,7 +27,7 @@ $ rm -rf patches/ .pc/ $ mkdir patches $ quilt import t/patch1.diff - > Importing patch patches/t/patch1.diff (stored as patches/patch1.diff) + > Importing patch t/patch1.diff (stored as patches/patch1.diff) $ quilt push > Applying patch patches/patch1.diff @@ -71,28 +71,13 @@ # test a few error cases $ quilt import missing.diff - > Importing patch patches/missing.diff (stored as patches/missing.diff) - > cp: cannot stat `missing.diff': No such file or directory - > Failed to import patch patches/missing.diff + > Patch missing.diff does not exist $ quilt import patches/patch1.diff - > Patch patches/patch1.diff exists. Replace with -f. - - $ quilt import -f patches/patch1.diff - > Replacing patch patches/patch1.diff with new version - > cp: `patches/patch1.diff' and `patches/patch1.diff' are the same file - > Failed to import patch patches/patch1.diff - - # no real damage has been done + > Importing patch patches/patch1.diff - $ cat patches/patch1.diff - > original description - > Index: d/f - > =================================================================== - > --- /dev/null - > +++ d/f - > @@ -0,0 +1 @@ - > +f + $ quilt import patches/patch2.diff + > Patch patches/patch2.diff already exists in series. # a simple use of import @@ -119,7 +104,7 @@ $ cp patches/patch1.diff t/patch1.patch $ quilt import t/patch1.patch - > Importing patch patches/t/patch1.patch (stored as patches/patch1.patch) + > Importing patch t/patch1.patch (stored as patches/patch1.patch) $ ls patches/ > patch1.diff |