summaryrefslogtreecommitdiffstats
path: root/test/conflicts.test
Commit message (Collapse)AuthorAgeFilesLines
* - No longer remove common extensions (.dif, .diff, .patch, .gz,Andreas Gruenbacher2004-01-311-16/+16
| | | | | | | .bz2) from patch names. This allows patches in the same series that only differ by extension, and cleans up the scripts a little. Also don't remove extensions when printing patch names. - Remove unused diffstat code.
* - No longer verify if patches remove cleanly by reverse applyingAndreas Gruenbacher2003-10-311-1/+1
| | | | | | | | | them: This doesn't always succeed, and the the equivalent of `quilt diff -z' should suffice, anyway. - Add `touch .pc/$patch' after successful refresh: Speeds up `quilt pop' after a refresh. - Update test suite. - apatch was printing a spurious newline.
* Add a new test case for conflicts while pushing.Andreas Gruenbacher2003-10-271-0/+139