Mercurial > hg > octave-lojdl > gnulib-hg
comparison gnulib-tool @ 17045:0e193bb29639
gnulib-tool: Remove old file names from .cvsignore, .gitignore.
* gnulib-tool (func_update_ignorelist): Don't use 'join -v 1' command
on the list of removed files.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 19 Aug 2012 14:06:50 +0200 |
| parents | 61736e6c8fbe |
| children | e23106558036 |
comparison
equal
deleted
inserted
replaced
| 17044:0f6e45cf9274 | 17045:0e193bb29639 |
|---|---|
| 5373 if test -n "$dir_added" || test -n "$dir_removed"; then | 5373 if test -n "$dir_added" || test -n "$dir_removed"; then |
| 5374 sed -e "s|^$anchor||" < "$destdir/$dir$ignore" | LC_ALL=C sort > "$tmp"/ignore | 5374 sed -e "s|^$anchor||" < "$destdir/$dir$ignore" | LC_ALL=C sort > "$tmp"/ignore |
| 5375 (echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \ | 5375 (echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \ |
| 5376 | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-added | 5376 | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-added |
| 5377 echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \ | 5377 echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \ |
| 5378 | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-removed | 5378 > "$tmp"/ignore-removed |
| 5379 ) | 5379 ) |
| 5380 if test -s "$tmp"/ignore-added || test -s "$tmp"/ignore-removed; then | 5380 if test -s "$tmp"/ignore-added || test -s "$tmp"/ignore-removed; then |
| 5381 if $doit; then | 5381 if $doit; then |
| 5382 echo "Updating $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)" | 5382 echo "Updating $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)" |
| 5383 mv -f "$destdir/$dir$ignore" "$destdir/$dir$ignore"~ | 5383 mv -f "$destdir/$dir$ignore" "$destdir/$dir$ignore"~ |