diff options
| author | Jean Delvare <jdelvare@suse.de> | 2014-10-30 18:34:18 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2014-10-30 18:34:18 +0100 |
| commit | b42985c9b2a5f8329ad393842487c4142951818e (patch) | |
| tree | 3a2961677212015d1f1d9fea08bd0cc63dc5a076 /test | |
| parent | c57b81b7367ebc6f3757b114302b537d6e305431 (diff) | |
| download | quilt-b42985c9b2a5f8329ad393842487c4142951818e.tar.gz | |
pop: Rearm consistency check if needed
If the series file is inconsistent, "quilt pop" will disable the
consistency check as it updates the timestamp of the database file.
It's OK if all patches are popped. If not then the series file may
still be inconsistent. In that case, we want to update the timestamp
of the series file, to rearm the consistency check.
Diffstat (limited to 'test')
| -rw-r--r-- | test/altered-series.test | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/test/altered-series.test b/test/altered-series.test index 5c231f3..3c1bf71 100644 --- a/test/altered-series.test +++ b/test/altered-series.test @@ -6,22 +6,24 @@ $ cat > patches/series < 02.patch < 03.patch -$ quilt push -q +$ quilt push -q 2 > Applying patch patches/01.patch > Patch patches/01.patch does not exist; applied empty patch -> Now at patch patches/01.patch +> Applying patch patches/02.patch +> Patch patches/02.patch does not exist; applied empty patch +> Now at patch patches/02.patch $ quilt series -v -> = patches/01.patch -> patches/02.patch +> + patches/01.patch +> = patches/02.patch > patches/03.patch # Touch the series file but preserve the order -> OK $ touch patches/series $ quilt series -v -> = patches/01.patch -> patches/02.patch +> + patches/01.patch +> = patches/02.patch > patches/03.patch # Change the order of the patch series -> complain @@ -33,6 +35,15 @@ $ cat > patches/series $ quilt series -v > The series file no longer matches the applied patches. Please run 'quilt pop -a'. +$ quilt pop +> Patch patches/02.patch appears to be empty, removing +> +> Now at patch patches/01.patch + +# That wasn't enough, keep complaining +$ quilt series -v +> The series file no longer matches the applied patches. Please run 'quilt pop -a'. + $ quilt pop -a > Patch patches/01.patch appears to be empty, removing > |