debian/topics and conflict resolution

[Manoj Srivastava]

On Mon, Oct 06 2008, martin f krafft wrote:

> also sprach Manoj Srivastava <srivasta at acm.org> [2008.10.04.0735 +0200]:
>>         Right. The diff.gz is what the buildd's are fed, each of the
>>  patchsets in ./debian/topic recreate exactly the feature branches used
>>  to develop the code, the orig.tar.gz is the upstream branch. So, just
>>  using the orig.ar.gz and each of these patches, one can exactly
>>  replicate the tip of all the branches in use.
>
> Who resolved conflicts, if the serialisation (== conflict
> resolution) is expressively *not* done before building the source
> package?

        Why does it matter to people who are looking at the source
 package who exactly created the integration branch? It could have been
 manually created, it could have been created with the assistance of
 tools.

        The take away point is that  with independent features, it
 should be feasible for people to study each feature in isolation, or
 all together, easily.

        Looking at subsets of features, but more than one at a time, is
 a less common task, and should be possible, but perhaps require a
 little work.

        manoj
-- 
It's now the GNU Emacs of all terminal emulators. Linus Torvalds,
regarding the fact that Linux started off as a terminal emulator
Manoj Srivastava <srivasta at acm.org> <http://www.golden-gryphon.com/>  
1024D/BF24424C print 4966 F272 D093 B493 410B  924B 21BA DABB BF24 424C