diff --git a/HypnotoadSVN.sublime-settings b/HypnotoadSVN.sublime-settings index 5a9023d..5aaa500 100644 --- a/HypnotoadSVN.sublime-settings +++ b/HypnotoadSVN.sublime-settings @@ -98,11 +98,10 @@ // "cleanup": "nativeSVN", // "lock": "nativeSVN", // "unlock": "nativeSVN", - - // Right now these commands are only supported in tortoise - // "resolve": "tortoiseSVN", - // "switch": "tortoiseSVN", - // "branch": "tortoiseSVN", + // "resolve": "nativeSVN", + // "switch": "nativeSVN", + // "branch": "nativeSVN", + // "merge": "nativeSVN", // "checkout": "nativeSVN" } } \ No newline at end of file diff --git a/README.md b/README.md index 69f664e..1c7cb64 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,10 @@ This plugin started from [dexbol/sublime-TortoiseSVN](https://github.com/dexbol/ - Support for using TortoiseSVN on Windows - Wide array of commands supported - Command history +- Customizable Side Bar ### Future -- Support for more native commands - Specify external program for diff/blame/etc. -- Improve interface for some commands - Folder diffs ##Requirements diff --git a/docs/settings.md b/docs/settings.md index b78047d..a8e3175 100644 --- a/docs/settings.md +++ b/docs/settings.md @@ -154,9 +154,24 @@ By default, all commands use the default, except for diff and blame, which prefe - unlock - diff - blame - -#### Unsupported commands - resolve - switch - branch +- merge - checkout + +## Project Settings +All settings can also be added to the project files. While inside the project, these settings will overwrite the global settings on a case by case basis, so you won't have to copy all settings into each new project. +In the project file, group all settings in the "HypnotoadSVN" object. + +### Branches +Branches can only be added to project settings. They are currently not accessible via global settings. +Branches will also automatically be added to you project settings as they are used. +When you are not in a project, branches must be manually entered each + +```Javascript +"branches": [ + 'http://source.url/svn/trunk', + 'http://source.url/svn/branches/my_branch' +] +```