You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2008/08/05 08:55:12 UTC
svn commit: r682605 - /xmlgraphics/fop/trunk/
Author: jeremias
Date: Mon Aug 4 23:55:12 2008
New Revision: 682605
URL: http://svn.apache.org/viewvc?rev=682605&view=rev
Log:
Removed merge tracking for "svnmerge" for
https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95
Modified:
xmlgraphics/fop/trunk/ (props changed)
Propchange: xmlgraphics/fop/trunk/
('svnmerge-blocked' removed)
Propchange: xmlgraphics/fop/trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 4 23:55:12 2008
@@ -1 +1 @@
-/xmlgraphics/fop/branches/fop-0_95:1-636405,636407-681285,681287-681290,681292-681370,681372-682601 /xmlgraphics/fop/trunk:1-611115
+/xmlgraphics/fop/trunk:1-611115
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
Re: svnmerge-integrated on FOP Trunk [was: Re: svn commit: r682605 - /xmlgraphics/fop/trunk/]
Posted by Jeremias Maerki <de...@jeremias-maerki.ch>.
I wondered about that, too. Adrian still works with svnmerge on the AFP
branch. Maybe it's indirectly used by svnmerge there. No idea if it's
safe to be removed. I'd leave it until none of us still uses svnmerge.
On 05.08.2008 11:09:29 Vincent Hennebert wrote:
> Hi,
>
> > Author: jeremias
> > Date: Mon Aug 4 23:55:12 2008
> > New Revision: 682605
> >
> > URL: http://svn.apache.org/viewvc?rev=682605&view=rev
> > Log:
> > Removed merge tracking for "svnmerge" for
> > https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95
> >
> > Modified:
> > xmlgraphics/fop/trunk/ (props changed)
> >
> > Propchange: xmlgraphics/fop/trunk/
> > ('svnmerge-blocked' removed)
> >
> > Propchange: xmlgraphics/fop/trunk/
> > ------------------------------------------------------------------------------
> > --- svnmerge-integrated (original)
> > +++ svnmerge-integrated Mon Aug 4 23:55:12 2008
> > @@ -1 +1 @@
> > -/xmlgraphics/fop/branches/fop-0_95:1-636405,636407-681285,681287-681290,681292-681370,681372-682601 /xmlgraphics/fop/trunk:1-611115
> > +/xmlgraphics/fop/trunk:1-611115
>
> Does anyone know why the value above remains? IIC the Trunk was tracking
> only the changes made to the 0.95 branch. So normally that property
> should have disappeared at all? Anyway ‘svnmerge avail’ now fails on FOP
> Trunk (as expected since there is nothing left to track).
>
> Thanks,
> Vincent
Jeremias Maerki
svnmerge-integrated on FOP Trunk [was: Re: svn commit: r682605 -
/xmlgraphics/fop/trunk/]
Posted by Vincent Hennebert <vh...@gmail.com>.
Hi,
> Author: jeremias
> Date: Mon Aug 4 23:55:12 2008
> New Revision: 682605
>
> URL: http://svn.apache.org/viewvc?rev=682605&view=rev
> Log:
> Removed merge tracking for "svnmerge" for
> https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95
>
> Modified:
> xmlgraphics/fop/trunk/ (props changed)
>
> Propchange: xmlgraphics/fop/trunk/
> ('svnmerge-blocked' removed)
>
> Propchange: xmlgraphics/fop/trunk/
> ------------------------------------------------------------------------------
> --- svnmerge-integrated (original)
> +++ svnmerge-integrated Mon Aug 4 23:55:12 2008
> @@ -1 +1 @@
> -/xmlgraphics/fop/branches/fop-0_95:1-636405,636407-681285,681287-681290,681292-681370,681372-682601 /xmlgraphics/fop/trunk:1-611115
> +/xmlgraphics/fop/trunk:1-611115
Does anyone know why the value above remains? IIC the Trunk was tracking
only the changes made to the 0.95 branch. So normally that property
should have disappeared at all? Anyway ‘svnmerge avail’ now fails on FOP
Trunk (as expected since there is nothing left to track).
Thanks,
Vincent