Ian I've had a bit of experience with this kind of thing, try the following steps:
1 - Take a svn diff manually from the root jena-maven-tools folder and save it in a patch file somewhere svn diff > ~/your-diff.patch 2 - Then svn update the Experimental directory (or check out a working copy of it if you don't have one already) 3 - In the jena-maven-tools folder within the Experimental directory run the following: patch -p0 -i ~/your-diff.patch 4 - You should now be able to commit your changes in the Experimental area 5 - Once you've safely committed the changes in the Experimental area you can blow away your trunk copy of jena-maven-tools and svn update to bring your trunk working copy back to a non-conflicted state Hope this helps, Rob On 15/01/2014 15:25, "Ian Dickinson" <[email protected]> wrote: >Ah. I see why I can't commit my changes - I hadn't realised you were >going to enact the posited move to experimental right now. > >I don't know what to do now. > >Ian > > >On Wed, Jan 15, 2014 at 2:16 PM, <[email protected]> wrote: >> Author: andy >> Date: Wed Jan 15 14:16:45 2014 >> New Revision: 1558393 >> >> URL: http://svn.apache.org/r1558393 >> Log: >> Move jena-maven-tools pending sorting out dependencies >> >> Added: >> jena/Experimental/jena-maven-tools/ (props changed) >> - copied from r1558392, jena/trunk/jena-maven-tools/ >> Removed: >> jena/trunk/jena-maven-tools/ >> >> Propchange: jena/Experimental/jena-maven-tools/ >> >>------------------------------------------------------------------------- >>----- >> --- svn:ignore (added) >> +++ svn:ignore Wed Jan 15 14:16:45 2014 >> @@ -0,0 +1,7 @@ >> +target >> + >> +.settings >> + >> +.classpath >> + >> +.project >> >> Propchange: jena/Experimental/jena-maven-tools/ >> >>------------------------------------------------------------------------- >>----- >> --- svn:mergeinfo (added) >> +++ svn:mergeinfo Wed Jan 15 14:16:45 2014 >> @@ -0,0 +1 @@ >> +/jena/branches/streaming-update/jena-maven-tools:1415418-1440838 >> >>
