I just tried that (despite it feeling wrong) and (again) no commits. I've done what I did (and documented in the wiki for repeatability) each and every time since the original creation of the LIVE branch. It always merges all the changes since the last merge. I feel like the LIVE branch was somehow bound to trunk again, and not being it's own branch. I never understood the information 'svn info' gives, but the 'Revision: 111528' at the top of each, I swear it used to differ between branches.
I think I'll try to find the e-mail Leo sent me on how to create the branch and start again. regards, Adam ----- Original Message ----- From: "Stefan Bodewig" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Friday, December 10, 2004 10:17 AM Subject: Re: Need SVN help pls ( was Re: stinking *no longer* email still flooding lists! ) > On Fri, 10 Dec 2004, Adam R. B. Jack <[EMAIL PROTECTED]> wrote: > > >> minotaur > svn merge -r 110068:110051 > >> https://svn.apache.org/repos/asf/gump/trunk/ > > I think that should have been > > svn merge -r 110050:110051 https://svn.apache.org/repos/asf/gump/trunk/ > > i.e. merge the specific change you had in mind. > > I've merged changes twice and basically did what you described (but > using the last revision of trunk before my change and the one with the > change I wanted to merge). > > Stefan > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
