[dev] [cvs] commit: horde/scripts merge.php

[Marko Djukic]

Quoting Marko Djukic <mdjukic at horde.org>:

> Quoting Jan Schneider <jan at horde.org>:
>
> > Zitat von Marko Djukic <mdjukic at horde.org>:
> >
> > > mdjukic     2005-11-16 10:18:50 PST
> > >
> > >  Modified files:
> > >    scripts              merge.php
> > >  Log:
> > >  this fixes for me when merging files in newly created directories,
> > > doing a mkdir first will not create the CVS directory for cvs up to
> > > succeed later on, with a cvs co the directory will be created with
> > > the CVS directory under it.
> >
> > I guess this won't work if you have -P in your .cvsrc file. Did you test
> > this?
>
> ah, no didn't test since I don't use the .cvsrc file. forgot you can set it
> there. can that be overridden in some way?

ok, -f should stop the reading of the .cvsrc file... how's that for others?

--
Marko Djukic
Horde Project (http://horde.org/)