Re: Automatically supply the origin URL in svn merge

On Wed, Mar 25, 2020 at 04:45:29PM +0300, Anton Shepelev wrote:
> Hello, all
>
> Why does even the basic sync-merging require that the user
> specify the source URL, as in:
>
> svn merge ^/project/trunk
>
> I think this requirement is redundant because SVN know
> exactly from which original original directory the branch
> was created by svn cp. Will you consider simplifying the
> basic merge syntax to:
>
> svn merge
> svn merge <local_path>
>
> so that SVN shall supply the origin URL automatically? Or
> am I wrong, and my proposal makes no sense?

Recall that SVN cannot know whether a copy operation is supposed to
create a new branch, or to copy a folder within the scope of a branch.
This distinction exists only in the human mind, not in the tool itself.

Also recall that users have the ability to check out a working copy
from any level of the tree.

When we combine your idea with the above two aspects of SVN's design,
we run into a problem.

Example:

svn mkdir ^/trunk
svn mkdir ^/trunk/dir1
svn copy ^/trunk ^/branches/mybranch
svn copy ^/mybranch/dir1 ^/mybranch/dir2
svn checkout ^/mybranch/dir2 my-dir2-working-copy
cd my-dir2-working-copy
svn merge

What will happen now?
Received on 2020-03-25 15:07:31 CET