Page 1 of 1

SVN Merge feature

Posted: Wed Jul 06, 2011 1:06 pm
by alexk
Please consider implement svn merge command support in Subversion plugin.

Re: SVN Merge feature

Posted: Wed Jul 06, 2011 2:28 pm
by eranif
Can you please provide some information on what you would like to see?


Re: SVN Merge feature

Posted: Fri Jul 22, 2011 6:27 pm
by alexk
Something similar to what "Merge a range of revisions" in TortoiseSVN does.

The dialog window must contain following widgets:

Text input <URL> "URL to merge from". This should take a string (svn url) or a path to some other working copy. A button for selection such would be nice. Also remembering last value would be very helpful.

Text input <RevisionsRange> "Revision range to merge". This string would be passed directly to svn. (see below)

Directory selector for working copy <WorkingPath>. This should default to current project dir or to currently highlighted dir (or something similar depending on how this dialog is called).

Checkboxes: "dry run" and "recursive" (recursive should be set by default). They correspond to svn options --dry-run and --non-recursive (-N)

And typical buttons: Cancel + Merge

Then simply invoke svn like this:

svn merge -r <RevisionsRange> <URL> <WorkingPath>

For "dry run" : svn merge --dry-run.....
If recursive option is NOT on: svn merge -N ...