debian/topics and conflict resolution (was: v3 Debian source package formats)

[martin f krafft]

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?

-- 
 .''`.   martin f. krafft <madduck at debian.org>
: :'  :  proud Debian developer, author, administrator, and user
`. `'`   http://people.debian.org/~madduck - http://debiansystem.info
  `-  Debian - when you have better things to do than fixing systems
 
i've not lost my mind. it's backed up on tape somewhere.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature (see http://martin-krafft.net/gpg/)
Url : http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/attachments/20081006/6c8a20e9/attachment.pgp