patches and commits (was Re: [Clam-devel] Re: test changes after refactoring of InstantTunningEstimator

Pau Arumi parumi at iua.upf.edu
Tue Jul 10 05:05:08 PDT 2007


En/na Roman Goj ha escrit:
> Step 2:
> 
> just dividing all the positions by 3.0 and passing 1 in the
> constructor of InstantTunningEstimator :)
> 
> ... but I'm suffering from the same problem Hernan asked about in
> [Clam-devel] [PATCH] (work in progress) Harmonizer
> 
> how can I make a patch against the svn and my first patch?

no you can not if you are modifying the same files. (well you could
with a local repo. too complicated anyway.)

in this scenario -modifying same files- just say: this patch
outdates that other patch.

when i asked for separated patches when possible i was thinking in
the hernan's case of modifications in the infrastructure
"InControl" and the processings that uses it. so here you can
easily do two dependent (numbered) patches just by choosing the
files

now a kind-of announcement: core developers have agreed to give
commit access to active developers!
in short (sysadm is working on it) we'll give details on how to do
it and guidelines about what 'active' developer means and when to
directly commit and when to send a patch first.

maybe it comes with some dangers but will bring lot of fun indeed!

pau


> 
> I made changes to assertFoundCenterIs() in the first patch... now I
> have to make more, so I'd need to patch against the svn with the added
> patch... but these patches will be coming faster than it's possible to
> apply them ;) (I'll try at least :) )
> 
> I tried looking for a solution on the net, but found nothing :(
> 
> So - I'm sending the second step with the first one included inside -
> sorry! how should I do this correctly?
> 
> roman
> 




More information about the clam-devel mailing list