subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andreas Krey <a.k...@gmx.de>
Subject Re: UNS: Re: adding --include-externals to svn diff
Date Sat, 02 Feb 2013 13:07:39 GMT
On Sat, 02 Feb 2013 11:51:15 +0000, Daniel Shahaf wrote:
> Matt Hargett wrote on Sat, Feb 02, 2013 at 02:04:06 +0000:
> > To parallel the additions of --include-externals to the 'commit' and 'ls'
> > commands, I would also like to propose adding the option to the 'diff'
> > command. I just tested latest trunk and the option is unrecognized.
> ...
> > Let me know what I can do, within reason, to help bring make these
> > commands more congruent for 1.8.0.
> 
> The first step is to define the behaviour of the would-be-added option.
> For example, is it only valid for working copy targets?  How does it
> behave when one or both targets is a URL?

Why, as if the URL were checked out and the diff done against the
resulting tree (minus .svn dirs, o/c). Which causes the interesting thing
that, when an external definition changes (like, from whatever/tags/3.0
to whatever/tags/3.1), you'd see the complete diff between 3.0 and 3.1.

And the more interesting question whether the diff of the svn:external
property itself should be shown at all.

(I find it much more complicated to define what commit --include-externals
would do - any one of

  'leave the svn:externals alone' to
      -- when the svn:externals references trunk or branches,

  'update the peg revs in the external'
      -- when using peg revisions,
  
  'commit into the trunk instead of the referenced tag,
   create a new tag, and put that into the external'
      -- our usual workflow, except that we don't just
         blindly commit into the externals
look desirable.)

Andreas

-- 
"Totally trivial. Famous last words."
From: Linus Torvalds <torvalds@*.org>
Date: Fri, 22 Jan 2010 07:29:21 -0800

Mime
View raw message