summaryrefslogtreecommitdiffstats
path: root/test/merge.test
Commit message (Collapse)AuthorAgeFilesLines
* - Switch from echo to printf for all translations: This is moreAndreas Gruenbacher2004-07-091-6/+6
| | | | | | | | | | | | | | | 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.
* - Add common GNU Diff format options to diff and refresH commands:Andreas Gruenbacher2004-07-041-3/+3
| | | | | | | | | | | -u, -U num, -c, -C num. REname old -c option (combine patches) of diff command to --combine. - Extend the function that splits comments froM patches and syntax coloring to handLe combined diff format. - Honor the LAnG environment variable again; this goT broken at some point. - Set TEXTDOMAINDIR to where the translations are put so that Messages are found even when not installing into /usr.
* - No longer remove common extensions (.dif, .diff, .patch, .gz,Andreas Gruenbacher2004-01-311-6/+6
| | | | | | | .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.
* Add test case for patch merging with `quilt diff'.Andreas Gruenbacher2003-10-271-0/+87