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

svn:mergeinfo problems

From: Adam <subs_at_adamsutton.co.uk>
Date: Thu, 19 Feb 2009 06:54:46 -0800 (PST)

Hi All,

I know there are several posts relating to mergeinfo problems but none
seem to have been updated recently and I'm having some rather annoying
problems at the moment.

Basically we've been using 1.5 builds for sometime and I like the idea
of the mergeinfo stuff (if not he implementation, I know I'm not alone
on that). I've just managed to get people to start using branches and
merges more within our project (rather than relying on me to do it).
And unfortunately we're getting stung by a few problems.

The main one relates to merge info being updated on files
unnecessarily. We have a rule on the project that merges into stable
release branches are reviewed. As files that have not been modified in
a merge are having their merge info updated this results in a
cluttered changelog and makes the review process much harder. For
those who are less familiar with the whole merge process this can also
be somewhat unsettling when they go to merge and often they end up
reverting all files/folders they don't believe they've changed,
including the top level folder which needs the merge info updating.

I have done a quick test (https based server running v1.5.1, I need to
update) and merged into a WC on which I know there are files that have
svn:mergeinfo set but would not be changed by the merge itself.

- With TSVN 1.5.8 all files in the WC with mergeinfo have the
mergeinfo updated (really annoying).
- With svn 1.5.5. command line this does not happen. Only those files/
folders directly affected have the mergeinfo updated (I would consider
this correct).

I must say that svn in general and TSVN in particular are great tools
and this won't put me off using them it's just an annoyance which I
think will cause us some problems moving forward.

What I'd like to know is do the developers considered this a bug? If
so any idea on when its likely to be fixed? If not, what is the logic
behind this operation (or am I just doing something wrong?).

Ta
Adam

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1192187

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-19 16:02:49 CET

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

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