how to do svn merge -x-w -x-b -x--ignore-eol-style <<start_tag>> <<end_tag>> <<workspace>>

View: New views
3 Messages — Rating Filter:   Alert me  

how to do svn merge -x-w -x-b -x--ignore-eol-style <<start_tag>> <<end_tag>> <<workspace>>

by sivagurunath :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Hi,

using svnkit, is the switches for the merge
-x-b (--ignore-space-change),
-x-w (--ignore-all-space) and
--ignore-eol-style  supproted??

If not, please tell me a workaround to simulate the same effect.

Please help me with this as this is an urgent issue for me to close....

Re: how to do svn merge -x-w -x-b -x--ignore-eol-style <<start_tag>> <<end_tag>> <<workspace>>

by Alexander Sinyushkin :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

In SVNKit those options are represented by the SVNDiffOptions class.
Use SVNDiffClient.setMergeOptions(SVNDiffOptions) to specify your merge
options before invoking a doMerge() method.

----
Alexander Sinyushkin,
TMate Software,
http://svnkit.com/ - Java [Sub]Versioning Library!

sivagurunath wrote:

> Hi,
>
> using svnkit, is the switches for the merge
> -x-b (--ignore-space-change),
> -x-w (--ignore-all-space) and
> --ignore-eol-style  supproted??
>
> If not, please tell me a workaround to simulate the same effect.
>
> Please help me with this as this is an urgent issue for me to close....

---------------------------------------------------------------------
To unsubscribe, e-mail: svnkit-users-unsubscribe@...
For additional commands, e-mail: svnkit-users-help@...


Re: how to do svn merge -x-w -x-b -x--ignore-eol-style <<start_tag>> <<end_tag>> <<workspace>>

by sivagurunath :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Thank you very much Alexander Sinyushkin....

You have saved my day....

Regards
Sivagurunath

Alexander Sinyushkin wrote:
In SVNKit those options are represented by the SVNDiffOptions class.
Use SVNDiffClient.setMergeOptions(SVNDiffOptions) to specify your merge
options before invoking a doMerge() method.

----
Alexander Sinyushkin,
TMate Software,
http://svnkit.com/ - Java [Sub]Versioning Library!

sivagurunath wrote:
> Hi,
>
> using svnkit, is the switches for the merge
> -x-b (--ignore-space-change),
> -x-w (--ignore-all-space) and
> --ignore-eol-style  supproted??
>
> If not, please tell me a workaround to simulate the same effect.
>
> Please help me with this as this is an urgent issue for me to close....

---------------------------------------------------------------------
To unsubscribe, e-mail: svnkit-users-unsubscribe@svnkit.com
For additional commands, e-mail: svnkit-users-help@svnkit.com