subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "KARR, DAVID" <dk0...@att.com>
Subject RE: If our SVN server is 1.6.12, why don't I see older merge history on elements merged from branch to trunk?
Date Thu, 12 Jul 2012 15:19:41 GMT
> -----Original Message-----
> From: Cooke, Mark [mailto:mark.cooke@siemens.com]
> Sent: Wednesday, July 11, 2012 11:00 PM
> To: users@subversion.apache.org
> Cc: KARR, DAVID
> Subject: RE: If our SVN server is 1.6.12, why don't I see older merge
> history on elements merged from branch to trunk?
> 
> > -----Original Message-----
> > From: KARR, DAVID [mailto:dk068x@att.com]
> > Sent: 12 July 2012 00:39
> > To: users@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.
> > 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.

I suppose I can see how you would have gotten that impression.

I'm pretty sure the upgrade was implemented before the recent merge.  I guess I'll need to
verify that to be sure.


Mime
View raw message