Re: debian/topics and conflict resolution

2008-10-06 Thread Manoj Srivastava
Hi, Perhaps I should wait after drinkina high sugar content drink before posting. On Mon, Oct 06 2008, Manoj Srivastava wrote: > On Mon, Oct 06 2008, martin f krafft wrote: > >> also sprach Manoj Srivastava <[EMAIL PROTECTED]> [2008.10.04.0735 +0200]: >>> Right. The diff.gz is w

Re: debian/topics and conflict resolution

2008-10-06 Thread Manoj Srivastava
On Mon, Oct 06 2008, martin f krafft wrote: > also sprach Manoj Srivastava <[EMAIL PROTECTED]> [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 or