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 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. > > But it does so automatically, and I have been talking to Petr about > adding support for temporary merge bases in case you only want > one-time integration of a set of branches (as for distro packaging, > for instance).
Ok, after reading the documentation again this seems to be the case. 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? >> Also, is there a trick to get the "ours" merge strategy used in >> .top* -files to work with octopus merge? > > It is my understanding that the ours strategy works with any number > of heads, so it should work fine with the octopus merge. This is > what the git-merge(1) manpage has to say about it: > > This resolves any number of heads, but the result of the merge is > always the current branch head. When I'm trying to an octopus merge, git fails on the .top* files. When merging in one branch at a time the ours strategy works fine. But maybe I'm using an old version of git. Teemu _______________________________________________ vcs-pkg-discuss mailing list email@example.com http://lists.alioth.debian.org/mailman/listinfo/vcs-pkg-discuss