On Thu, 2008-10-30 at 09:11 -0700, Erik Nordmark wrote: > At the ipobs putback you'll have to collapse all its deltas into a > single one. Have you worked out what impact this will have on other CWDs > that are children of it?
The repo that Phil will use for integration is: /net/zhadum.east/export/ws/pk34663/ipobs-putback The changesets are collapsed there. This is the first time that I will have gone through an exercise like this with hg, but I can run an experiment by taking a clone of clearview-noipmp, then re-parenting it to this ipobs-putback repo. From there I'll do an hg pull and hg merge and see what kind of chaos ensues. > FWIW I've found that a hg reci in a parent is easy to handle in children > that have identical content to the parent, but I have never tried this > with a child that has different content that the parent. Me neither. This particular series of events was very disruptive with teamware (perpetual merges for files that are not different in content from the parent), and I don't know if hg makes it any better. -Seb
