[Zope3-checkins] CVS: Zope3/src/zope/fssync - main.py:1.31

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/fssync
In directory cvs.zope.org:/tmp/cvs-serv27711

Modified Files:
	main.py 
Log Message:
minor improvemnts and additions to the help text


=== Zope3/src/zope/fssync/main.py 1.30 => 1.31 ===
--- Zope3/src/zope/fssync/main.py:1.30	Tue Aug 12 12:47:21 2003
+++ Zope3/src/zope/fssync/main.py	Tue Aug 12 13:09:01 2003
@@ -16,13 +16,16 @@
 
 Command line syntax summary:
 
+%(program)s [global_options] help [COMMAND ...]
 %(program)s [global_options] checkout [local_options] URL [TARGETDIR]
 %(program)s [global_options] update [local_options] [TARGET ...]
 %(program)s [global_options] commit [local_options] [TARGET ...]
 %(program)s [global_options] diff [local_options] [TARGET ...]
 %(program)s [global_options] status [local_options] [TARGET ...]
-%(program)s [global_options] add [local_options] TARGET ...
+%(program)s [global_options] add [local_options] PATH ...
+%(program)s [global_options] mkdir [local_options] PATH ...
 %(program)s [global_options] remove [local_options] TARGET ...
+%(program)s [global_options] resolve [local_options] PATH ...
 %(program)s [global_options] checkin [local_options] URL [TARGETDIR]
 
 ``%(program)s -h'' prints the global help (this message)
@@ -235,7 +238,8 @@
 def status(opts, args):
     """%(program)s status [TARGET ...]
 
-    Print brief (local) status for each target, without changing any files.
+    Print brief (local) status for each target, without changing any
+    files or contacting the Zope server.
     """
     fs = FSSync()
     fs.multiple(args, fs.status)
@@ -280,7 +284,7 @@
     fs.multiple(args, fs.revert)
 
 def mkdir(opts, args):
-    """%(program)s mkdir TARGET ...
+    """%(program)s mkdir PATH ...
 
     Create new directories in directories that are already known to
     %(program)s and schedule the new directories for addition.
@@ -289,8 +293,10 @@
     fs.multiple(args, fs.mkdir)
 
 def resolve(opts, args):
-    """%(program)s resolve [TARGET ...]
+    """%(program)s resolve [PATH ...]
 
+    Clear any conflict markers associated with PATH.  This would allow
+    commits to proceed for the relevant files.
     """
     fs = FSSync()
     fs.multiple(args, fs.resolve)