Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r1571 - trunk/fsvs: . src

fsvs
Discussion topic

Back to topic list

svn commit: r1571 - trunk/fsvs: . src

Author pmarek
Full name P.Marek
Date 2008-03-27 06:17:58 PDT
Message Author: pmarek
Date: 2008-03-27 06:17:58-0700
New Revision: 1571

Modified:
   trunk/fsvs/CHANGES
   trunk/fsvs/src/options.c

Log:
A removed file means text changed, too.

Modified: trunk/fsvs/CHANGES
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/CHANGES​?view=diff&rev=1​571&p1=trunk/fsv​s/CHANGES&p2=tru​nk/fsvs/CHANGES&​r1=1570&r2=1571
====================​====================​====================​==================
--- trunk/fsvs/CHANGES (original)
+++ trunk/fsvs/CHANGES 2008-03-27 06:17:58-0700
@@ -2,6 +2,7 @@
 - New option for conflict handling; allows "stop" (historical default),
     "local", "remote", "both" or "merge".
 - New "resolve" action.
+- Filter option "text" now means removed entries, too.
 - Verbose "urls dump".
 - Checkout now prints the entries as they're checked out.
 - Small fixes and cleanups.

Modified: trunk/fsvs/src/options.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/opt​ions.c?view=diff​&rev=1571&p1=tru​nk/fsvs/src/options.​c&p2=trunk/fsvs/​src/options.c&r1​=1570&r2=1571
====================​====================​====================​==================
--- trunk/fsvs/src/options.c (original)
+++ trunk/fsvs/src/options.c 2008-03-27 06:17:58-0700
@@ -65,15 +65,15 @@
 /** Filter strings and bits.
  * \ref glob_opt_filter. */
 const struct opt___val_str_t opt___filter_strings[]= {
- { .val=FILTER__ALL, .string="any" },
- { .val=FS_CHANGED | FS_NEW, .string="text" },
- { .val=FS_META_CHANGED, .string="meta" },
- { .val=FS_META_MTIME, .string="mtime" },
- { .val=FS_META_OWNER, .string="owner" },
- { .val=FS_META_GROUP, .string="group" },
- { .val=FS_NEW, .string="new" },
- { .val=FS_REMOVED, .string="deleted" },
- { .val=0, .string="none" },
+ { .val=FILTER__ALL, .string="any" },
+ { .val=FS_CHANGED | FS_NEW | FS_REMOVED, .string="text" },
+ { .val=FS_META_CHANGED, .string="meta" },
+ { .val=FS_META_MTIME, .string="mtime" },
+ { .val=FS_META_OWNER, .string="owner" },
+ { .val=FS_META_GROUP, .string="group" },
+ { .val=FS_NEW, .string="new" },
+ { .val=FS_REMOVED, .string="deleted" },
+ { .val=0, .string="none" },
     { .string=NULL, }
 };

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r1571 - trunk/fsvs: . src pmarek P.Marek 2008-03-27 06:17:58 PDT
Messages per page: