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

Re: [Subclipse-users] Files which never merge properly

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 4 Sep 2009 12:25:46 -0400

On Fri, Sep 4, 2009 at 12:17 PM, Steve Cohen<scohen_at_javactivity.org> wrote:
> I am maintaining two branches of code.  At some point, months ago, I
> moved files from one directory to another.  Something got screwed up, I
> don't remember what it was.
>
> At any rate, whenever I do a merge between these two branches, these
> files, which are identical both in content and location (in the new
> directory) between the two branches show up as needing to be checked
> into SVN on the branch into which the merge was done, in spite of no
> changes being present.  I have tried everything to make this go away,
> but I cannot.  I always include them in my commits and they always
> return the next time I do a merge.  It's not a show-stopper but it is an
> annoyance.  How can I get rid of it?

If the file has the svn:mergeinfo property, then the change is likely
to that property. When you do a merge, every item with that property
has it updated.

You can probably safely delete the property. The only reason not to
would be if you did some merges specifically to that file that you did
not do to the entire branch.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2391043
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-09-04 18:26:55 CEST

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