josh/jsvn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

README: document ../... reference syntax for diff/log

Browse Source
This commit is contained in:
Josh Holtrop 2012-06-27 11:19:01 -04:00
parent 1150cede62
commit a989cf6fd7
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
README
View File

@ -2,8 +2,8 @@ Josh's SVN wrapper script
This wrapper script to Subversion supplements normal svn behavior by This wrapper script to Subversion supplements normal svn behavior by
adding additional functionality or modifying the output of the default adding additional functionality or modifying the output of the default
svn subcommands. Much of the functionality implemented here was inspired svn subcommands (simplification and colorization). Much of the functionality
by the way that git works. implemented here was inspired by the way that git works.
It is recommended to put this script in your $PATH as 'jsvn' or something It is recommended to put this script in your $PATH as 'jsvn' or something
other than 'svn' and to make an alias svn='jsvn'. other than 'svn' and to make an alias svn='jsvn'.
@ -27,6 +27,11 @@ Implemented subcommands:
- with -d, delete <branch> - with -d, delete <branch>
- otherwise, create a new branch from the current one - otherwise, create a new branch from the current one
- also switch to the new branch if -s is given - also switch to the new branch if -s is given
diff
- allow specifying ref1..ref2 syntax to show the diff between two references
- references can be tag names, branch names, or 'trunk'
- allow specifying ref1...ref2 syntax to show the diff between the common
ancestor of ref1 and ref2 and ref2's HEAD
tag[s] [[-d] <tag_name>] | [-m <old_tag_name> <new_tag_name>] tag[s] [[-d] <tag_name>] | [-m <old_tag_name> <new_tag_name>]
- with no arguments, list tags - with no arguments, list tags
- with -d, delete <tag> - with -d, delete <tag>
@ -36,6 +41,9 @@ Implemented subcommands:
- switch to 'trunk', branch name, or tag name without having to specify - switch to 'trunk', branch name, or tag name without having to specify
the full URL the full URL
- falls back to Subversion "switch" if <short_name> doesn't exist - falls back to Subversion "switch" if <short_name> doesn't exist
log
- allow specifying ref1..ref2 syntax to show the log entries for
ref2 which are not a part of ref1
merge <branch> merge <branch>
- merge branch <branch> into the current WC path - merge branch <branch> into the current WC path
- falls back to Subversion "merge" if <branch> doesn't exist - falls back to Subversion "merge" if <branch> doesn't exist
@ -79,13 +87,6 @@ Implemented subcommands:
- delete stash object <id> - delete stash object <id>
- <id> defaults to the newest stash object created - <id> defaults to the newest stash object created
The following subcommands are executed using their native handler, but
have their output simplified and/or colorized:
- diff
- log
- status
- update
If the subcommand name begins with two leading underscores ("__"), the If the subcommand name begins with two leading underscores ("__"), the
underscores will be stripped and the command will be handled by native underscores will be stripped and the command will be handled by native
Subversion without any jsvn processing. Subversion without any jsvn processing.