[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: dirs_same_p and summarizing diff

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 9 Oct 2008 09:36:55 -0400

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):
>
> A wc1/file
> Adding wc1/file
> Transmitting file data .
> Committed revision 1.
> A wc2/file
> + svn diff --old=file:////arch/elego/svn/test/repos1 --new=wc2
> subversion/libsvn_ra_local/ra_plugin.c:266: (apr_err=170000)
> svn: 'file:///arch/elego/svn/test/repos1'
> is not the same repository as
> 'file:///arch/elego/svn/test/repos2'
> + echo
>
> + svn merge -c 1 file:////arch/elego/svn/test/repos1 wc2
> Conflict discovered in 'wc2/file'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (mc) mine-conflict, (tc) theirs-conflict,
> (s) show all options: e
> Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
> (mc) mine-conflict, (tc) theirs-conflict,
> (s) show all options: r
> --- Merging (from foreign repository) r1 into 'wc2':
> A wc2/file
> C wc2
>
>
> 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.

> ...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?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
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 15:37:13 CEST

This is an archived mail posted to the Subversion Dev mailing list.