RE: reintegrate merge failing because "can only be used if revisions were previously merged", but it's a lie (I think?)

branch is still hurting my head. How did the reintegration know what to do if I deleted most of my branch's mergeinfo? -- Ricky Charlet -Original Message- From: Andreas Stieger [mailto:andreas.stie...@gmx.de] Sent: Thursday, May 21, 2015 9:53 AM To: Charlet, Ricky Subject: RE: re

RE: reintegrate merge failing because "can only be used if revisions were previously merged", but it's a lie (I think?)

step would be to check this in (to branch)? Or to merge trunk into branch again? -- Ricky Charlet -Original Message- From: Andreas Stieger [mailto:andreas.stie...@gmx.de] Sent: Thursday, May 21, 2015 9:53 AM To: Charlet, Ricky Subject: RE: reintegrate merge failing because "can only

RE: reintegrate merge failing because "can only be used if revisions were previously merged", but it's a lie (I think?)

arlet -Original Message- From: Andreas Stieger [mailto:andreas.stie...@gmx.de] Sent: Wednesday, May 20, 2015 11:23 PM To: Charlet, Ricky Cc: users@subversion.apache.org Subject: Re: reintegrate merge failing because "can only be used if revisions were previously merged", but it&#

reintegrate merge failing because "can only be used if revisions were previously merged", but it's a lie (I think?)

Howdy, I have a trunk and a feature branch. Time has come (it was long, over a year) to reintegrate back into trunk. I have subversion 1.8 on both server and client (though a year ago, we were using 1.6 server and client). I have recently (like yesterday) merged trunk to branch