[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 13:12:39 -0400

On Mon, Oct 5, 2009 at 12:50 PM, Nicholas Curry <Nicholas.Curry_at_cofunds.co.uk>
> So is it correct to say that during a merge, SVN reports changes where
> the file has
> only changed in the source branch in the same way as when the file has
> changed in
> both the source and destination branches? (i.e. with 'U'?)

Yes, definitely.

Prior to the tree conflict feature added in 1.6, I do not believe
there was ever a case where SVN even looked to see if a file had been
changed in the destination branch. Now, I believe there are cases
where it does check that in order to flag a tree conflict. Such as
when a folder is deleted by merge, but new files have been added to
the folder on the branch.

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

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