Compare actions available from History View, e.g.'Edit Conflicts' action in Synchronize View.'Compare In External Compare Editor' action in Synchronize View.Here's a list of actions which can call external compare editor: This is how 'Diff Viewer' properties page looks like: It includes configuration for following file extensions: doc, docx, xls, xlsx, ppt, pptx, odt, ods.ĭefault diff handlers provided by Subversive are loaded and can be used only on Microsoft Windows.įor other operating systems users can configure their own handlers. Subversive is supplied with default configuration for file extension associations, default configuration includes paths to script files Sure this is OK Also, on a working copy file REPLACED by a directory, it does. svn log -verbose can kind of show what I'm looking for, but I have to add up all the changes to. I'd like to see what files/directories/symlinks have been added/deleted between two revisions. merged: The conflicted file, where to save. Instead of (revision 0) it prints (nonexistent). I can't seem to find a way to use Subversion to take a diff of directory structure changes between two revisions.theirs: The file as it is in the repository.mine: Your own file, with your changes.base: The original file without your changes.When it encounters one of these it will substitute the appropriate value. Subversive uses substitution parameters in a form %. The external program will need to obtain the filenames from the command line, along with any other command line options. Merge program settings are applied for Edit Conflicts action. Example of mime-type usage: text/plain.Īlso user can specify external diff program which will be applied for all files by using an asterisk(*) in extension/mime-type field.įor each file extension/mime-type user can specify following parameters: diff program path, diff program arguments, merge program path, merge program parameters.ĭiff program settings are applied for compare actions. For example, in order to specify file extension for doc files use.
to see the difference between two branches, specify the whole URL. User can associate an external diff program to specific file extension or mime type. to see the difference between two revisions, use '-r' svn diff -r9200:9400. On this page user can configure external diff/merge programs used for comparing different revisions of files.
0 kommentar(er)
