diff options
Diffstat (limited to 'test/conflicts.test')
| -rw-r--r-- | test/conflicts.test | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/test/conflicts.test b/test/conflicts.test index 0581fbd..fe250e8 100644 --- a/test/conflicts.test +++ b/test/conflicts.test @@ -23,50 +23,50 @@ anymore, then the patch is fixed. < g $ quilt new a.diff - > Patch a.diff is now on top + > Patch %{P}a.diff is now on top $ quilt add one.txt - > File one.txt added to patch a.diff + > File one.txt added to patch %{P}a.diff $ mv one.txt one.orig $ sed -e "s/4/4+/" -e 's/d/d+/' one.orig > one.txt $ quilt refresh - > Refreshed patch a.diff + > Refreshed patch %{P}a.diff $ quilt pop -q - > Removing a.diff + > Removing patch %{P}a.diff > No patches applied $ sed -e "s/^\\([17]\\)\$/\\1-/" one.orig > one.txt $ quilt push -q - > Applying a.diff - > Now at patch a.diff + > Applying patch %{P}a.diff + > Now at patch %{P}a.diff $ quilt pop -q - > Removing a.diff + > Removing patch %{P}a.diff > No patches applied $ sed -e "s/^\\([1267]\\)\$/\\1-/" one.orig > one.txt $ quilt push -q - > Applying a.diff - > Now at patch a.diff + > Applying patch %{P}a.diff + > Now at patch %{P}a.diff $ quilt pop -q - > Removing a.diff + > Removing patch %{P}a.diff > No patches applied $ sed -e "s/^\\([123567]\\)\$/\\1-/" one.orig > one.txt $ quilt push -q - > Applying a.diff + > Applying patch %{P}a.diff > 1 out of 2 hunks FAILED -- rejects in file one.txt - > Patch a.diff does not apply (enforce with -f) + > Patch %{P}a.diff does not apply (enforce with -f) $ quilt push -qf - > Applying a.diff + > Applying patch %{P}a.diff > 1 out of 2 hunks FAILED -- saving rejects to file one.txt.rej - > Applied a.diff (forced; needs refresh) + > Applied patch %{P}a.diff (forced; needs refresh) $ mv one.txt one.x $ sed -e "s/4/4+/" one.x > one.txt @@ -107,7 +107,7 @@ anymore, then the patch is fixed. > g $ quilt refresh - > Refreshed patch a.diff + > Refreshed patch %{P}a.diff $ cat patches/a.diff | grep -v "^\\(---\\|+++\\)" > Index: d/one.txt @@ -132,7 +132,7 @@ anymore, then the patch is fixed. > g $ quilt pop -q - > Removing a.diff + > Removing patch %{P}a.diff > No patches applied $ cd .. |