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

Re: SVN incorrectly reporting a file was updated ('U') by a merge, when it was actually merged ('G')

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 5 Oct 2009 12:35:21 -0400

On Mon, Oct 5, 2009 at 12:26 PM, Nicholas Curry
<Nicholas.Curry_at_cofunds.co.uk> wrote:

> I’ve had an issue recently where following a merge, a file was reported as
> updated rather than merged:
>
> D:\Subversion\test\svn>svn merge "svn://path/to/folder"
>
> --- Merging r654299 through r655378 into '.':
>
> U    ap_insDeal.sql
>
>
>
> This file was actually changed in both the source and destination branches,
> so I would have expected SVN to report it as merged (‘G’, rather than ‘U’ in
> the line above.) Has anyone else seen this? I couldn’t find anything similar
> in the issue tracker. Is it worth trying to create a script to recreate the
> issue?

The only time you see a 'G' is if there are local changes to merge.
Prior to 1.5 you would only have got a 'G' if you merged into a
working copy that has uncommited changes. With merge tracking in
1.5+, the merge process can touch the same file multiple times, in
which case you will get a 'U' the first time and then a 'G' on the
subsequent updates to the file.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2403804
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-05 18:36:11 CEST

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