> bzr diff --change shelf:3 That sounds good. Then "unshelve --keep" becomes equivalent to "bzr merge -r shelf:N". See https://bugs.launchpad.net/bzr/+bug/939262 Stefan