TopGit: problem with patch series generation

Avery Pennarun apenwarr at gmail.com
Tue Aug 12 16:25:36 UTC 2008


On Tue, Aug 12, 2008 at 12:18 PM, martin f krafft <madduck at debian.org> wrote:
> As I am packaging TopGit for Debian, I encountered
> the situation that two branches conflict with each other (they
> change the same line), but there is no dependency between the
> branches. Thus, when I squash the branches into a series, the
> resulting patches will not apply (they both change the same original
> line to something else).

Isn't this what git-rerere is for?  If TopGit doesn't use rerere,
maybe it would be easy to add...

Have fun,

Avery



More information about the vcs-pkg-discuss mailing list