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

Re: Update that pulls a null delta

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Fri, 12 Oct 2012 15:02:35 -0400

On 10/12/2012 10:05 AM, Daniel Shahaf wrote:
> If an update pulls in a null delta --- eg, because it updates across two
> revisions that revert each other --- then it should behave as though it
> pulled nothing at all: output no 'U filename' lines, and print "At
> revision %ld".
> Right?

I could understand arguments both ways for this, and certainly Subversion
distinguishes between "file's been changed between versions X and Y" and
"file's content differs between versions X and Y".

Immediately prior to performing an update such as the one you describe,
you'd want 'svn status -u' to show you that the remote version was modified
and not obscure that fact simply because the delta is null -- this is an
indication that any attempt to commit local mods to that file is doomed to
an out-of-date failure.

Likewise, it *could* be confusing for folks who do attempt to commit such a
locally modified file 'foo', get an out-of-date error on the commit, run
'svn update foo' to resolve that issue but then see no output at all.

C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development

Received on 2012-10-12 21:03:12 CEST

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