Re: New patches for 0.7: skapp undusting and reload.py

[C. Ecker]

On Sun, 7 Nov 2004, Bernhard Reiter wrote:

> On Sun, Nov 07, 2004 at 12:41:14PM +0100, C. Ecker wrote:
> > Sorry for the stupid question:
> >
> > - What is the best way of applying the patches?
>
> For my two patches:
> Check out or update 0.7 from cvs.
> cd into the module.
>
>       cat .xx.diff | patch -d .
>

Still does not work. The files are not found correctly (which has to do
with the annoying -p parameter) for the undusting-skapp patch.  For the
other one I get the following:

cat new-reload-20041022.diff | patch -d .
patching file ChangeLog
patch: **** malformed patch at line 20: Index: Sketch/UI/reload.py

Christof

> > The usual way does not
> > seem to work and I do not have the patience to figure it out myself.
>
> Actually that is the usual way, use -d and -p accordingly to what
> you can see in the diff headers.
>
> > A related question is how changes to the source should be commited --
> > directly put it in CVS or by submitting patches ? Isn't there a danger
> > that we end up with a confusing and interfering flood of patches ?
>
> Until Bernhard (H.) puts Skencil into a place where
> we can give out CVS write access easily,
> we probably should use patches against CVS or each other
> and the savannah patch tracker.
>
> I am tempted to try using monotone (http://www.venge.net/monotone/)
> myself until this is the case.
>
>       Bernhard R.
>
> --
> Professional Service around Free Software                (intevation.net)
>
> If Skencil is useful for you, consider tipping the project:
>                http://www.skencil.org/payments.html
>