subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Cooke, Mark" <mark.co...@siemens.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 Fri, 13 Jul 2012 06:53:54 GMT
> -----Original Message-----
> From: KARR, DAVID [mailto:dk068x@att.com] 
> Sent: 12 July 2012 17:34
> To: users@subversion.apache.org
> 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
> > Sent: Wednesday, July 11, 2012 4:39 PM
> > 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?
> 
> I found out that the framework was upgraded, but not the 
> repository.  Isn't it the case that merge tracking won't be 
> available until the repository is upgraded?
> 
I'm assuming you mean the svn server software has been upgraded but that the repository data
format has not been dump/loaded or upgraded?  The release notes for 1.5 seem to support you:-

http://subversion.apache.org/docs/release-notes/1.5.html#mt-compatibility
{{{
As described earlier, merge-tracking is not supported unless you upgrade the repository as
well as the server.
}}}

~ mark c

Mime
View raw message