[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: Mark Phippard <markphip_at_gmail.com>
Date: 2007-04-04 14:07:44 CEST

On 4/4/07, Paul Burba <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 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

Mark Phippard
Received on Wed Apr 4 14:07:57 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.