That was to be expected. Run a "svn revert -R .". This will revert all the files to the state in the repository. Note that you will lose any changes that you made since you sent the patch. HTH.
On 27.07.2005 14:17:17 Bielik, Robert wrote: > You're welcome :) However, I did a "svn up" and several .java files had > conflict > resolve markers in them (<<<<< ===== >>>>>). > > I'm not used to svn, is there something more I need to do? > > /Robert > > > -----Original Message----- > > From: Jeremias Maerki [mailto:[EMAIL PROTECTED] > > Sent: Wednesday, July 27, 2005 12:02 PM > > To: fop-dev@xmlgraphics.apache.org > > Subject: Re: Building Fop 1.0dev with JDK 1.3 ?? > > > > > > Thanks a lot, Robert. This saved me a lot of time. I've committed your > > patch to the repository. > > > > http://svn.apache.org/viewcvs?rev=225486&view=rev > > > > On 27.07.2005 10:56:19 Bielik, Robert wrote: > > > Ok, diff file is attached. build.properties and build.xml > > is included in it but > > > I guess you can scrap that part... > > > > > > Regards, > > > /Robert > > > > > > > -----Original Message----- > > > > From: Jeremias Maerki [mailto:[EMAIL PROTECTED] > > > > Sent: Wednesday, July 27, 2005 10:50 AM > > > > To: fop-dev@xmlgraphics.apache.org > > > > Subject: Re: Building Fop 1.0dev with JDK 1.3 ?? > > > > > > > > > > > > I see. So, do you know how to create a patch? Just run "svn diff > > > > >mydiff.txt" and send us the file. That way I don't have to > > > > recreate all > > > > your changes. Thanks in advance! > > > > > > > > > > > > > > > Jeremias Maerki > > > > Jeremias Maerki
