> -----Original Message----- > From: KARR, DAVID [mailto:dk0...@att.com] > Sent: Friday, July 13, 2012 2:56 PM > 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: Bob Archer [mailto:bob.arc...@amsi.com] > > Sent: Friday, July 13, 2012 10:11 AM > > To: KARR, DAVID; Cooke, Mark; 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 [mailto:dk0...@att.com] > > > Sent: Thursday, July 12, 2012 11:20 AM > > > To: Cooke, Mark; 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: Cooke, Mark [mailto:mark.co...@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:dk0...@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. > > > > Merge information is written by the client not the server. So, the > > merge info being there depends on the client version. > > > > BOb > > Isn't it really both sides, however? The client may write the information, > but > if the repository isn't configured for merge tracking, it won't store that > info. > Is that correct?
No that's not correct. I think there is some optimization with merges when you have the newer version of the server, ie, it won't send back un-needed revs or something. But, all merge tracking is are svn properties which the previous server version certainly support. What version of the server are you running? BOb
