Mark Phippard wrote:
> On Thu, Oct 9, 2008 at 1:28 AM, Neels J Hofmeyr <neels_at_elego.de> wrote:
> > What about another case I encountered today in ./merge_tests.py 88 89:
> > foreign-repos <> wc
> >
> > A diff doesn't work, but a merge does (test script attached):
> >
[...]
> >
> > So, if we were to add a summarizing-diff before each merge, it would break
> > all foreign-repos merges...
>
> Couldn't we just skip some of this stuff for foreign repository
> merges? We already do some of that with merge tracking. I think it
> is reasonable for some features to be removed when doing this.
To the principle that we shouldn't spend too much effort on making
foreign-repository merges work as well as same-repository merges, I
agree. Yes, we can explicitly disable this check if necessary.
I hope fixing it properly will actually turn out to be the simpler
solution (as many of such problems come from having overly special-cased
things in the first place), but I haven't looked into the details so
this may be naïve.
> > ...and, I think I'd like to open a micro-branch for this thing. I can just
> > decide about that myself now, right?
>
> I have a "meta-question". At some point are you going to make the
> actual svn diff --summarize command support a WC to REPOS compare? As
> I said a few weeks ago, this is something that GUI clients would
> really benefit from having work. If that is the plan, does it make
> sense to get that code into trunk and working first?
Yes, that is what we're doing here. We'll see the user-level "diff
--summarize" support extended before or no later than tree conflicts
make use of it.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-09 16:00:36 CEST