Re: "multi-part" merge with conflicts does not "bail out with an error message"

Thanks for clear answer.

On Fri, Nov 14, 2008 at 7:27 PM, Mark Phippard <markphip_at_gmail.com> wrote:
>...
>
> However, this same logic is not implemented when you yourself give
> Subversion multiple revisions to merge. Your example above:
>
> svn merge --accept postpone -c 4 -c 6 %pathRepo%/trunk work\branch
>
> Is the same as if you did this:
>
> svn merge --accept postpone -c 4 %pathRepo%/trunk work\branch
> svn merge --accept postpone -c 6 %pathRepo%/trunk work\branch
>

Let me explain why it too easy to make multiple revision merge call indirectly.

We use TortoiseSVN for merging to maintenance branches.
TortoiseSVN v 1.5.x has new merge wizard.
The wizard allows to select range of revisions in *filtered* log list.
This range may falls to several revision pieces in full log.
The wizard allows select several single revisions to make merge.
After that TortoiseSVN calls svn api to make merge.

If TortoiseSVN makes several calls svn::merge with single range of
revision then TortoiseSVN is responsible for the broken conflicted
file.

If TortoiseSVN makes one call svn api then it is a subject of
discussion who makes wrong.

I don't know what is right way?
I can send this issue to developers of tortoiseSVN and suppose that it
is not an Subversion issue?

----
Andrey
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org