summaryrefslogtreecommitdiffstats
path: root/test/conflicts.test
Commit message (Collapse)AuthorAgeFilesLines
* - test/*.test: Make sure that rm commands are non-interactive.Jean Delvare2006-09-191-1/+1
|
* - configure.ac: Require GNU patch 2.4+.Andreas Gruenbacher2006-01-231-1/+1
| | | | | | - quilt/import.in: Don't use diff -U-1. - Test suite: Recognize output of old versions of patch (from jayvdb@gmail.com).
* - GNU patch 2.5 messages differ slightly from the messages of moreAndreas Gruenbacher2006-01-211-1/+1
| | | | | | recent versions. Recognize the old version's output when fixing patch's output in the push command, and also accept the old version's output in the test suite.
* - Fix the test suite so that directories leftover from a previouslyJean Delvare2005-09-231-0/+1
| | | | interrupted test won't cause a test to fail.
* - Fix the test suite so that it doesn't fail if any higher-levelAndreas Gruenbacher2005-09-231-1/+1
| | | | | directory contains a patches/ sub-directory (iow, if quilt itself is patched with quilt).
* - When applying a patch with -q and without -f no (individual)Andreas Gruenbacher2004-10-171-1/+1
| | | | | | | | | | | reject files are created, and the "patching file" comments are missing as well. In that case, we don't know wich files the "-- saving rejects to file /tmp/foo" comments belong to, and we can't fic them up. Remove them, instead. - Pop command: Touch files after they are restored so that tools like make don't get confused. - Update test cases. - Bump to version 0.37.
* - Switch from echo to printf for all translations: This is moreAndreas Gruenbacher2004-07-091-16/+16
| | | | | | | | | | | | | | | stable than having expansions in messages that might change independent of the message. - Add print_patch function and always use it when printing patch names. Remove -n options from various scripts and use a global switch QUILT_PATCHES_PREFIX in .quiltrc to decide between patch names with and without directory prefix. Depending on user experience this switch may eventually go away. - Add --diffstat option to refresh command: If given, this option inserts diffstat statistics at the end of the patch header, or refreshes the existing diffstat output. No special tags in the path file (%diffstat or the like) are needed. - Minor fix inserting changelog into RPM specfile.
* - 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
generated by cgit (git 2.34.1) at 2024-09-22 04:55:15 +0000