[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: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-04-04 14:28:47 CEST

Mark Phippard wrote:
> On 4/4/07, *Paul Burba* <pburba@collab.net <mailto:pburba@collab.net>>
> wrote:
> When merging into a file with preexisting local modifications, our
> code
> in merge.c:merge_file_changed() always reports a mer'G'e has occurred,
> even if the merge made no change to the file (i.e. svn_wc_merge2()
> returns a merge outcome of svn_wc_merge_unchanged).
> This results in a lot of incorrect notifications with merge-tracking -
> see http://svn.haxx.se/dev/archive-2007-03/1157.shtml
> <http://svn.haxx.se/dev/archive-2007-03/1157.shtml> But I'd argue
> it's incorrect regardless of merge-tracking and would like to
> apply the
> attached patch. I see no problems with this, but Philip Martin's
> question in merge_file_changed()...
> In your example (in the mailing list archive link), the file is not
> updated by the merge, but the file's properties are. Shouldn't there
> be a notification due to the properties being updated? Or are we
> trying to suppress those when it is the mergeinfo property?
> With the possible exception that we are trying to hide the updates to
> mergeinfo properties, I'd have excpected to see a property update
> notification.
For property merge we still get 'G' even if the WC already as the same
local change.

With regards
Kamesh Jayachandran

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 4 14:29:00 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.