Screw this "treat the whole repository as a single thing".
To disentangle a thrash, I am copying files one or two at a ti,me from a thrashing branch to a new branch.
Something like
hg update -r careful-branch
hg revert -r thrashing-branch file1.cpp file1.h
...
hg ci -m 'file1.cpp/.h merged from careful-branch'
Basically doing a file by file merge.
It sucks that Mercurial does not record this as a merge. Doesn't show up in the graphical diagram drawn by glog. I'd like some sort of dotted line.
Hmm : could track workflow - what files remain to be merged. Even on a diff chunk by chunk basis:
merge this chunk ; reject this chunk; defer until next pass.
No comments:
Post a Comment