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

--ignore-properties for merge

From: Sergei Riaguzov <riaguzov_at_gmail.com>
Date: Thu, 7 Nov 2013 09:43:24 +0100


Is there a way to exclude mergeinfo changes from commit? I.e. to use
--ignore-properties for svn merge in the same way as for svn diff?

Rationale: imagine a feature branch which is created for implementing just
one feature. There are many commits with messages like "grrr..." or "wtf"
or whatever else since this is just a private branch for a feature. There
are also bunch of merges from trunk back to feature branch.

Now the feature is done and the branch is to be reintegrated back to trunk.
It works, however commit contains a lot of property changes of directories
(mergeinfo). Also files that were added in the branch now have a property,
saying from were they were added.

The feature branch is to be removed after reintegration and no one is
supposed to see all those stupid messages. So what I would like to do is to
create a patch with a difference between branch and trunk and then apply a
patch to trunk. Now there will be only one commit and no mergeinfo changes,
as if there is only one commit for a feature. This is exactly what I want
but it is not convenient at all because if there will be conflicts you
won't have a way to postpone them or resolve them.

What I want to do is being in trunk to say something like:

svn merge --ignore-properties ^trunk

It works for diff (svn diff --ignore-properties --old trunk --new branch)
but there is no such option for merge. Is there a possibility that this
option can be added in a feature release?

Received on 2013-11-07 10:00:48 CET

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