Mailinglist Archive: opensuse-gnome (216 mails)

[Stanislav Brabec <sbrabec@xxxxxxx>]

Michael Wolf wrote:

> I don't propose writing our own, of course.  There's no need.

We even may start with osc - osc is based on svn and their authors could
help us with accessing its svn functions.


> But to say that revision control doesn't work well for packages?  I
> don't buy it.

It was my practical experience.

In December 2006 we branched ~280 packages to G:U to move packages
to /usr.

I did a complete backup of all packages in the branch point.

G:U changed ~250 packages.

Factory changed ~30 packages.

There was ~30 packages with paralles changes.

In late January 2007 I went to merge both branches.

>From those ~30 packages, ~20 was fixed by a simple merge and ~10 had to
be merged manually.

The major problems of simple diff-patch-wiggle are:

- Upstream updated package and fixed the same problem in parallel. Added
patch is rendered obsolete.

- Changes are in the same patch. Second level patch are often hard to
apply (code change -> patch change -> second level patch cannot apply).

- Changes in spec preamble often conflict - upgrade changes patch sets,
fix does it as well. You have to merge patch set as first in order.

-- 
Best Regards / S pozdravem,

Stanislav Brabec
software developer
---------------------------------------------------------------------
SUSE LINUX, s. r. o.                          e-mail: sbrabec@xxxxxxx
Lihovarská 1060/12                            tel: +420 284 028 966
190 00 Praha 9                                fax: +420 284 028 951
Czech Republic                                http://www.suse.cz/

-- 
To unsubscribe, e-mail: opensuse-gnome+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-gnome+help@xxxxxxxxxxxx