Re: dom/ and content/ source reorganization
Benjamin Smedberg <[email protected]>
| Newsgroups | gmane.comp.mozilla.devel.dom |
|---|---|
| Message-ID | <[email protected]> |
On 1/20/09 10:51 AM, Mike Shaver wrote: > What effect will this have on moving changesets from m-c to > mozilla-1.9.1 after they've baked? I'm a little worried about adding > extra hassle or risk to that process at this stage in the schedule, I > admit. You won't be able to use automatic techniques such as `hg export rev | hg import -`, due to misapplied patches. You will be able to use MQ to rebase trunk->branch. hg up trunkrev hg qimport -r. hg qsave -e -c hg up -C branchtip hg qpush -m You can also just use `patch` and type the old filename. The outstanding set of patches *looks* relatively small to me; I want to catch the sweet spot where there I'm not significantly disrupting branch work, but also not disrupting other big changes that might in the works on trunk. --BDS