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

svn log -g inconsistent after merging a subtree separately

From: Michael Schierl <schierlm_at_gmx.de>
Date: Thu, 28 Apr 2011 20:06:39 +0200

[ Please CC: me since I am not subscribed to the list. Thank you. ]


I'd like to report what I think is a yet another bug in SVN 1.6.16.
(Seems that SVN bugs are currently liking me...) I reproduced it both
with the command line client and with TortoiseSVN for Windows.

When you have two branches and regularly merge files from one branch to
another, you can either merge them on the whole branch (mergeinfo will
be written there) or on a subfolder (which puts the mergeinfo on the
subfolder). In case you have files changed in a subfolder by a merge you
did on the whole branch, and anyone on your team merges *one* change on
that branch to that subfolder only, that branch shows *all* merges that
were made in this folder (which were several hundreds) in the merge
history for that revision.

I attached a dump of a simple repository containing 2 changes on trunk
which are individually merged to the branch. The second merge was
performed on the subfolder and its revision history is broken. (Not a
big deal in this small example, but a big deal in our "live" repository).



Received on 2011-04-28 20:07:16 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.