Stefan Sperling wrote on Thu, 26 Mar 2020 21:02 +00:00:
> The ultimate goal here is to allow users to type less characters when
> starting merges. Scripting tab-completion for SVN URL arguments into
> your favourite shell would also be a usable and effective solution.
What would the algorithm be?
Stefan Sperling wrote on Thu, 26 Mar 2020 10:45 +0100:
> On Thu, Mar 26, 2020 at 01:10:25AM +0300, Anton Shepelev wrote:
> > Daniel Shahaf:
> > > However, I can also see circumstances in which this smartness
> > > could be counter-productive:
> > >
> > > 1. In repository restructurings, such as
On Thu, Mar 26, 2020 at 08:46:35PM +, Daniel Shahaf wrote:
> Stefan Sperling wrote on Thu, 26 Mar 2020 10:45 +0100:
> > Renames are modelled as copy+delete in SVN.
>
> They are, but we can behave differently depending on whether or not the
> adding-with-history was accompanied by a deletion
Stefan Sperling wrote on Thu, 26 Mar 2020 22:02 +0100:
> On Thu, Mar 26, 2020 at 08:46:35PM +, Daniel Shahaf wrote:
> > Stefan Sperling wrote on Thu, 26 Mar 2020 10:45 +0100:
> > > Renames are modelled as copy+delete in SVN.
> >
> > They are, but we can behave differently depending on
Stefan Sperling wrote on Thu, 26 Mar 2020 11:15 +0100:
> On Thu, Mar 26, 2020 at 01:10:25AM +0300, Anton Shepelev wrote:
> > Daniel Shahaf:
> > > however, I don't think the lack of these distinctions is
> > > necessarily a blocker. It just means we need to be more careful
> > > about not
Stefan Sperling:
> It's not that simple, as the conflict resolver demonstates.
> You're not taking cases into account where multiple copies within
> a signle revision correspond to a single deletion.
>
> So if you want to handle that then you must either error out when
> the heuristic fails, or
Daniel Shahaf:
> Yes, this feature won't happen unless someone invests time in
> making it happen -- but let's not discourage people from
> discussing feature ideas even if they may not personally have
> time to implement them. Discussions are just as useful a
> contribution as patches.
It is
On Thu, Mar 26, 2020 at 01:10:25AM +0300, Anton Shepelev wrote:
> Daniel Shahaf:
> > However, I can also see circumstances in which this smartness
> > could be counter-productive:
> >
> > 1. In repository restructurings, such as running «svn merge» in a
> > working copy of ^/thebarproject/trunk
On Thu, Mar 26, 2020 at 01:10:25AM +0300, Anton Shepelev wrote:
> Daniel Shahaf:
> > however, I don't think the lack of these distinctions is
> > necessarily a blocker. It just means we need to be more careful
> > about not writing automation that will help some cases and
> > backfire in others.
