Re: Branches to patches

2008-08-27 Thread martin f krafft
also sprach Teemu Ikonen <[EMAIL PROTECTED]> [2008.08.21.1610 +0100]: > I already have, but TopGit does not really solve the same problem, > namely serializing a set of possibly conflicting heads with the end > result being identical to the state of an integration branch. At least > it does not do

Re: Branches to patches

2008-08-27 Thread Teemu Ikonen
On Wed, Aug 27, 2008 at 3:42 PM, martin f krafft <[EMAIL PROTECTED]> wrote: > also sprach Teemu Ikonen <[EMAIL PROTECTED]> [2008.08.21.1610 +0100]: >> I already have, but TopGit does not really solve the same problem, >> namely serializing a set of possibly conflicting heads with the end >> result

Re: Branches to patches

2008-08-27 Thread martin f krafft
also sprach Teemu Ikonen <[EMAIL PROTECTED]> [2008.08.27.2009 +0100]: > So my integration (or debian) branch should be a TopGit branch > which depends on all the applied feature branches + upstream, and > I should do the conflict resolution when the base for it is > merged? Yes. -- .''`. mart