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

svn 1.5 merge tracking svn:mergeinfo and svn diff --summarize

From: Michael Reinelt <michael_at_reinelt.co.at>
Date: Wed, 23 Jul 2008 14:45:22 +0200

Hi there,

I've been using subversion for several years now with great success, but
1.5 doesn't work any longer with my specific setup.

I am managing customer-specific configurations and scripts for another
software product with svn. I don't use tags, but I use branches (every
customer has two branches: one for the production system, and one for
the test system). And there's trunk, which consists of files that should
be the same at every customer.

Changes are made either at the test or the production system, committed
and ported to the other branch. To find out wether something has changed
in either branch, I'm using "svn diff --summarize <URL of branch 1> <URL
of branch 2>", which has been working great in the past!

Now with the new merge-tracking feature of svn-1.5, there is a new
property called svn:mergeinfo, and as soon as I merge something, this
property will change, resulting in a diff reported by 'svn diff

Even worse, I somehow managed to merge this property difference into the
other branch, and after a few minutes, I hat such a mess, that I had to
restore the whole repository, and downgraded to 1.4 again.

So here are my questions:

- is there a possibility to deactivate the whole merge-tracking with
1.5? (I don't need it at the moment, maybe later)

- is there a way to tell 'svn diff' and 'svn merge' to ignore the
svn:mergeinfo property? (other properties must not be ignored, they are
important for my setup and need to be ported from one branch to the other)

Thanks a lot for every hint!

bye, Michael

Michael Reinelt <michael_at_reinelt.co.at>
GPG-Key 0xDF13BA50
ICQ #288386781
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-23 14:45:53 CEST

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.