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

mergeinfo properties getting carried around, makes for confusing merges

From: Denis Haskin <denis_at_haskinferguson.net>
Date: Mon, 09 Nov 2009 09:15:20 -0500

(Subversion 1.5.4)

Every time I do a merge from 1 branch to another, there's a set of files
that have their mergeinfo properties updated but nothing else. It's
incredibly annoying, since it means when I look at commit history, I
can't tell what really changed in a commit and what just got mergeinfo
properties updated.

Is this really normal behavior?

It's possible that in the past someone (maybe even me) wasn't consistent
with doing merges without+with --ignore-ancestry. Could that have
caused this?

I wonder if there was some merge in the past that wasn't done right that
is causing this to keep happening. Can I get rid of this behavior maybe
by deleting all the mergeinfo properties from all files (sort of
starting clean)?

Thoughts? Thanks...

dwh

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2415794

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-09 15:23:22 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.