try to use thg2.1.1 workbench to create new patch and rebuild current patch of MQ queue. in old thg1x that was intuitive record extention implemented and i`ve easy select\deselect hunks need in changeset. in new thg, as i understand, shelve extention shoud use to select hunks, but this is not capable to reconfigure current changeset\patch - cause hunks accepted in changeset is not viewable in working dir, and as for patches - shelve can rebuild only unapplyed patches, and this is real tricky to record a few patches from current working dir changes. I vote, imho it is realy need to come back record extention reatures from old thg1x into new workbench.
Issue #998 duplicate