[SVN] r4613 (Subversion)

Chris Thomas chris at cjack.com
Tue Aug 8 18:19:09 UTC 2006


[NEW] Add 'Show Revisions Available for Merging'. If you're using the svnmerge tracking tool, you can select the root of the branch in the project drawer and this command will show you a log of available revisions, nicely formatted by the standard Subversion Log formatter. Multiple HEADS are handled gracefully. But: this is a work in progress. You can't actually merge or block from the log window. Errors and edge cases show up as log parse errors.

• To make this work, I made the log parser tolerant of blank lines in the separator state. svnmerge concatenates multiple log entries and sometimes adds a blank line before separators in doing so.

Changed:
A   trunk/Bundles/Subversion.tmbundle/Commands/Show Available Revisions for Merging.tmCommand
U   trunk/Bundles/Subversion.tmbundle/Support/format_log.rb
U   trunk/Bundles/Subversion.tmbundle/info.plist



More information about the textmate-dev mailing list