On Thu, Aug 21, 2008 at 4:31 PM, martin f krafft <[EMAIL PROTECTED]> wrote:
> also sprach Teemu Ikonen <[EMAIL PROTECTED]> [2008.04.03.1058 +0200]:
>> I've made a python program (actually a rather thin wrapper around git
>> and various tools from patchutils) which makes this transformation
>> from an upstream branch, a set of feature branches and an integration
>> branch stored in git to a series of patch files. It's called
>> git-genpatches and is attached to this mail. The revert patches
>> between feature patches are made by python program minrevert (also
>> attached) which takes patches A and B and outputs a patch reverting
>> those hunks in patch A which overlap with hunks in patch B.
> You will want to check out topgit...

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 this automatically without the need to create extra
merged bases.

TopGit is nice though, but it still needs some work. A 'tg clone'
command which would pull also the bases automatically would be nice to
have. Also, is there a trick to get the "ours" merge strategy used in
.top* -files to work with octopus merge?


vcs-pkg-discuss mailing list

Reply via email to