I'm trying to move changes from a couple of changesets into one changeset on the other branch. There are other changes in between that I want to skip, so I don't want to simply merge everything.
hg transplant
moves the changes correctly, but now I'd like to flatten them into a single commit. How can I do that?
You can fold them by
hg qimport -r first-to-fold-rev:
)hg qpop
until the first patch is applied, then hg qfold <<patch name>>
the following patches into this one)hg qrefresh -e
)hg qfinish -a
).hg qpush
until the head patchhg qfinish -a
hg glog
/hg incoming
)