17.08.2010 21:33, Roland McGrath wrote:
Some of that cruft was there because of the merge with writer that I don't remember anymore why I had done. I cleaned everything up and merged the dwarf branch in. The dwarflint branch now only touches dwarflint plus there is one related update to dwarfstrings.c/h.
Ok. But now that branch brings in the history of the wrong branch and then deleting that stuff, right? I'm not sure I like that at all.
Yeah, like that.
If every commit touched either dwarflint stuff only or writer stuff only, then I think we can fairly easily tease it back apart. e.g., do "git rebase -i dwarf" and then drop all the commits that are for writer stuff rather than dwarflint stuff.
From doing "git log --stat origin/dwarf..origin/pmachata/dwarflint" it looks off hand like they are all separate.
It wasn't, a couple commits touched both this and that. But I rebased it all relatively painlessly, most commits were clean. The current pmachata/dwarflint is a clean fork off dwarf, the original branch was deleted and replaced with the new one.
I pushed what used to be the old branch to pmachata/dwarflint-old, where I'll keep it a week or so in case I forgot about something.
PW