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

RE: If our SVN server is 1.6.12, why don't I see older merge history on elements merged from branch to trunk?

From: Cooke, Mark <mark.cooke_at_siemens.com>
Date: Thu, 12 Jul 2012 06:59:38 +0100

> -----Original Message-----
> From: KARR, DAVID [mailto:dk068x_at_att.com]
> Sent: 12 July 2012 00:39
> To: users_at_subversion.apache.org
> Subject: If our SVN server is 1.6.12, why don't I see older
> merge history on elements merged from branch to trunk?
>
> It appears that our SVN on our server was recently upgraded
> from a version before merge history tracking was implemented,
> to version 1.6.x, where merge history should be available.

I wonder why a "recent" upgrade used 1.6.x instead of 1.7.x...

> However, I checked the SVN history for an element that I made
> changes to on a branch, and I looked at that same element
> after it was merged (by someone else) to the trunk. My
> changes are in that file, but the SVN history doesn't include
> the checkin that I did. Is this simply happening because of
> how the merge to trunk was done? Is there a particular way
> that merges have to be done to preserve merge history?

It sounds like you are expecting merge history to magically appear for merges done _before_ the server was upgraded? In that case, no, svn does not go back and try to re-create history (I suspect that would be at best an error-prone exercise) but you should start to see info being added going forward.

Or did I misunderstand your question?

~ mark c
Received on 2012-07-12 08:00:30 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.