Debian packaging with git and conflicts resolution

Manoj Srivastava srivasta at
Thu Nov 20 18:56:55 UTC 2008

On Wed, Nov 19 2008, Nicolas Duboc wrote:

>   Manoj, could you detail a particular scenario where you had conflicts
> between the topic branches ?

        Sure. Back when I was still the sole maintainer of refpolicy, I
 had a branch where we had a Debian specific user role called netuser --
 this added to the the set of roles upstream policy had created,
 (sysadmin, staff, user, ...). This required modifications of files that
 touched a lot of places, since a user entity is used in a lot of
 security domains (file permissions, ability access other security
 domains, etc).

        Almost any of the other Debian specific branches came into
 conflict with that branch. While the other branches eventually travel
 upstream, netuser remained a Debian only thing (and thus often had
 issues with every upstream version), until Russell Coker decided to
 drop that branch recently.

        There have been other issues, for example, in the old vm
 package, until they were incorporated and modified to not conflict in
 the new 18.x upstream. I can probably go back through the history and
 dig out details, but ...

"No problem is so formidable that you can't walk away from it." Schulz
Manoj Srivastava <srivasta at> <>  
1024D/BF24424C print 4966 F272 D093 B493 410B  924B 21BA DABB BF24 424C

More information about the vcs-pkg-discuss mailing list