I'd prefer to preserve the history if possible, but I also realize this forces you to redo the whole exercise. Other opinions? I'm just a mentor, not a dictator. ;-)
On 12.03.2009 08:45:11 Andreas Lehmkühler wrote: > > What is just a bit unfortunate is that this way, the history of the move > > is lost. SVN supports doing moves with modifications preserving the full > > history. > At the end, I saw that with my checkin new files were added and jukka > did a move modifying the package structure of jempbox. So, what should > we/I do? Revert to the old state and do it again of course on the > preferred way? > > > For example, Subclipse in Eclipse does a pretty good job on > > such moves. > I'm using a version control system (PVCS) for years now, but the > handling in the background is quite different. Obviously I have to > learn some more things about that details. > > Andreas > > > > On 11.03.2009 23:47:32 Andreas Lehmkühler wrote: > > > So, after some hours without thinking about the mess I left earlier this > > > evening, I calmed down and found the problem. After deleting my local > > > copy completely, I was able to check in the moved classes. > > > I hope everything went well. > > > > > > Good night, > > > Andreas > > > > > > Andreas Lehmkühler schrieb: > > > > I guess, I need some help here. I try to commit the new > > > > package-structure, but svn somehow stops just after delete the old > > > > source. Now, I can't commit the new one. I get several errors, but I > > > > can't get it commited. > > > > > > > > Any hints for solving my problem would by appreciated. > > > > > > > > Thanks in advance. > > > > > > > > P.S.: I will have a look later on the mess I left. I've an appointment > > > > for the next few hours. > > > > > > > > Sorry > > > > > > > > Andreas Lehmkühler > > > > > > > > [email protected] schrieb: > > > >> Author: lehmi > > > >> Date: Wed Mar 11 16:51:02 2009 > > > >> New Revision: 752515 > > > >> > > > >> URL: http://svn.apache.org/viewvc?rev=752515&view=rev > > > >> Log: > > > >> PDFBOX-437: Prepare JempBox and FontBox for release, Mapped all FontBox > > packages to org.apache.fontbox, Also moved the source folders to meet the > > Maven conventions, Updated project version and some Apache branding. > > > >> > > > >> Added: > > > >> incubator/pdfbox/fontbox/trunk/src/main/ > > > >> incubator/pdfbox/fontbox/trunk/src/main/java/ > > > >> Removed: > > > >> incubator/pdfbox/fontbox/trunk/src/org/ > > > >> Modified: > > > >> incubator/pdfbox/fontbox/trunk/build.xml > > > >> incubator/pdfbox/fontbox/trunk/pom.xml > > > >> > > > >> Modified: incubator/pdfbox/fontbox/trunk/build.xml > > > >> URL: > > http://svn.apache.org/viewvc/incubator/pdfbox/fontbox/trunk/build.xml?rev=75 > > 2515&r1=752514&r2=752515&view=diff > > > >> > > ============================================================================ > > == > > > >> --- incubator/pdfbox/fontbox/trunk/build.xml (original) > > > >> +++ incubator/pdfbox/fontbox/trunk/build.xml Wed Mar 11 16:51:02 2009 > > > >> @@ -21,7 +21,7 @@ > > > >> <property environment="env"/> > > > >> > > > >> <property name="build.compiler" value="modern" /> > > > >> - <property name="src.dir" value="src" /> > > > >> + <property name="src.dir" value="src/main/java" /> > > > >> <property name="dest.dir" value="classes" /> > > > >> <property name="bin.dir" value="bin" /> > > > >> <property name="website.dir" value="website" /> > > > >> @@ -33,8 +33,8 @@ > > > >> <property name="resources.dir" value="Resources" /> > > > >> <property name="checkstyle.config" value="fontbox-checkstyle.xml" > > /> > > > >> > > > >> - <property name="project.name" value="FontBox"/> > > > >> - <property name="project.version" value="0.2.0-dev" /> > > > >> + <property name="project.name" value="fontbox"/> > > > >> + <property name="project.version" value="0.8.0-incubating-dev" /> > > > >> > > > >> <property name="checkstyle.jar.dir" value="lib" /> > > > >> <property name="checkstyle.jar" > > value="${checkstyle.jar.dir}/checkstyle-all-*.jar" /> > > > >> @@ -47,10 +47,6 @@ > > > >> <property name="ikvmc" value="${ikvm.dir}/bin/ikvmc.exe"/> > > > >> > > > >> <path id="build.classpath"> > > > >> - <fileset dir="lib" > > > > >> - <include name="**/*.jar" /> > > > >> - <exclude name="**/${project.name}*.jar" /> > > > >> - </fileset> > > > >> <pathelement path="${dest.dir}" /> > > > >> <pathelement path="." /> > > > >> </path> > > > >> @@ -127,7 +123,7 @@ > > > >> <section name="common"> > > > >> <attribute name="Specification-Title" > > value="FontBox"/> > > > >> <attribute name="Specification-Version" > > value="${project.version}"/> > > > >> - <attribute name="Specification-Vendor" > > value="FontBox.org"/> > > > >> + <attribute name="Specification-Vendor" > > value="Apache Software Foundation"/> > > > >> </section> > > > >> </manifest> > > > >> </jar> > > > >> > > > >> Modified: incubator/pdfbox/fontbox/trunk/pom.xml > > > >> URL: > > http://svn.apache.org/viewvc/incubator/pdfbox/fontbox/trunk/pom.xml?rev=7525 > > 15&r1=752514&r2=752515&view=diff > > > >> > > ============================================================================ > > == > > > >> --- incubator/pdfbox/fontbox/trunk/pom.xml (original) > > > >> +++ incubator/pdfbox/fontbox/trunk/pom.xml Wed Mar 11 16:51:02 2009 > > > >> @@ -29,7 +29,7 @@ > > > >> > > > >> <groupId>org.apache.pdfbox</groupId> > > > >> <artifactId>fontbox</artifactId> > > > >> - <version>0.2.0-incubator-SNAPSHOT</version> > > > >> + <version>0.8.0-incubator-SNAPSHOT</version> > > > >> > > > >> <name>FontBox - Java Font Library</name> > > > >> <!-- Keep on a single line, see > > http://jira.codehaus.org/browse/MJAR-39 --> > > > >> > > > >> > > > >> > > > > > > > > > > > > > > > > > -- > > > Auf der Verpackung stand "benötigt Windows 9x/2000/XP oder BESSER", also > > > habe ich Linux installiert. > > > > > > > > > > Jeremias Maerki > > > > > > --- original Nachricht Ende ---- Jeremias Maerki
