To avoid in the future (painful) retrieval of changes made on a branch and not in the trunk and vice-versa, I'd suggest to always work on the trunk, and systematically merge the changes into the current branch. That should ease things IMHO.
Thanks! Vincent [EMAIL PROTECTED] a écrit : > Author: vhennebert > Date: Mon Dec 18 09:56:05 2006 > New Revision: 488369 > > URL: http://svn.apache.org/viewvc?view=rev&rev=488369 > Log: > Merge back changes of revision 462811 from the 1.1 branch into the trunk > > Modified: > xmlgraphics/commons/trunk/status.xml > > Modified: xmlgraphics/commons/trunk/status.xml > URL: > http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/status.xml?view=diff&rev=488369&r1=488368&r2=488369 > ============================================================================== > --- xmlgraphics/commons/trunk/status.xml (original) > +++ xmlgraphics/commons/trunk/status.xml Mon Dec 18 09:56:05 2006 > @@ -27,7 +27,10 @@ > </todo> > > <changes> > - <release version="Trunk" date="n/a"> > + <release version="1.1" date="n/a"> > + <action context="Code" dev="JM" type="add"> > + Added the start of an XMP metadata framework. > + </action> > </release> > <release version="1.1" date="TBD"> > <action context="Code" dev="JM" type="fix"> > > > > --------------------------------------------------------------------- > Apache XML Graphics Project URL: http://xmlgraphics.apache.org/ > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > --------------------------------------------------------------------- Apache XML Graphics Project URL: http://xmlgraphics.apache.org/ To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
