diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-11-17 19:49:43 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-11-17 19:49:43 +0000 |
| commit | 55d662beaf3ff81a72d2d8c71807d2adba569ebe (patch) | |
| tree | a4dd345b9248253b1d5444cb56c7738d83574870 /quilt/files.in | |
| parent | 26c7e9c357a45e7afe462708eb6232d72df80469 (diff) | |
| download | quilt-55d662beaf3ff81a72d2d8c71807d2adba569ebe.tar.gz | |
- Add new command `quilt fold' to fold one patch into another.
- Fix bug in `quilt files': Files that are neither present in the
working directory and have an empty backup copy sometimes were
still listed.
- Some minor cleanups in apatch.
- Add test/fold.test, and fix a now-useless check in one.test.
Diffstat (limited to 'quilt/files.in')
| -rw-r--r-- | quilt/files.in | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/quilt/files.in b/quilt/files.in index 796b9e2..3db405e 100644 --- a/quilt/files.in +++ b/quilt/files.in @@ -87,28 +87,30 @@ then fi fi -if [ -z "$opt_verbose" ] -then - files_in_patch $patch -else - for file in $(files_in_patch $patch) - do - status=" " - if [ -s $(backup_file_name $patch $file) ] +for file in $(files_in_patch $patch) +do + status=" " + if [ -s $(backup_file_name $patch $file) ] + then + if ! [ -s $file ] + then + status="-" + fi + else + if [ -s $file ] then - if ! [ -s $file ] - then - status="-" - fi + status="+" else - if [ -s $file ] - then - status="+" - fi + continue fi + fi + if [ -z "$opt_verbose" ] + then + echo "$file" + else echo "$status $file" - done -fi + fi +done ### Local Variables: ### mode: shell-script ### End: |