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

RE: [PATCH]: Stop mer'G'e notification for files with local mods that are unchanged by merge

From: Paul Burba <pburba_at_collab.net>
Date: 2007-04-04 15:48:57 CEST

> -----Original Message-----
> From: Mark Phippard [mailto:markphip@gmail.com]
> Sent: Wednesday, April 04, 2007 8:57 AM
> To: Paul Burba
> Cc: Kamesh Jayachandran; Subversion Development; Daniel Rall;
> Peter N. Lundblad; philip@codematters.co.uk
> Subject: Re: [PATCH]: Stop mer'G'e notification for files
> with local mods that are unchanged by merge


> I might be misunderstanding Mark, but I think he is
> referring only to
> svn:mergeinfo?
> If so this is somewhat of a separate issue. Currently
> we do treat the
> svn:mergeinfo prop as special and don't notify
> regarding changes to it
> (hmmm, not sure if this always true but I think it is
> ATM). I'm not
> sure if this was by design, I see nothing in the specs
> that indicates it
> was, perhaps Dan or Kamesh can speak to this?
> Regardless I think the
> current behavior is correct, svn:mergeinfo changes show
> up in status
> (they are after all properties), but I wouldn't want to
> see them in the
> output of svn merge since I see them more as
> meta-(meta?)-data on the
> merge rather than part of it.
> OK, so let's say another property was set and merge updated
> the property value, what would it report as?

It would report as ' U' -- All prop changes (other than svn:mergeinfo)
are reported normally regardless of my patch.

> What I was kind of getting at is maybe 'G' is expected here
> because of the property update and the real fix is to hide it
> when only mergeinfo is updated?

My fault for not clarifying at the start of this thread that I was
referring to local *text* modifications 'M ' not prop mods ' M' and text
merges 'G ' not prop merges ' G'. Property and text change
notifications are handled separately within merge_file_changed() so that
is not the problem.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 4 15:49:29 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.