diff options
Diffstat (limited to 'test/new.test')
| -rw-r--r-- | test/new.test | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/test/new.test b/test/new.test new file mode 100644 index 0000000..dfa8f64 --- /dev/null +++ b/test/new.test @@ -0,0 +1,53 @@ + $ mkdir -p d/patches + $ cd d + + $ echo reject > f + $ echo p.diff > patches/series + $ cat > patches/p.diff + < --- d.orig/f + < +++ d/f + < @@ -1 +1 @@ + < -old + < +new + < --- d.orig/g + < +++ d/g + < @@ -0,0 +1 @@ + < +added + + + $ quilt push + > Applying 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) + + $ quilt push -f + > Applying 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) + + $ echo new > f + $ quilt refresh + > Refreshed patch p.diff + $ cat patches/p.diff | sed -e "s/\\t.*//" + > Index: d/f + > =================================================================== + > --- d.orig/f + > +++ d/f + > @@ -1 +1 @@ + > -reject + > +new + > Index: d/g + > =================================================================== + > --- d.orig/g + > +++ d/g + > @@ -0,0 +1 @@ + > +added + + $ cd .. + $ rm -rf d |