cmd_cherry_pick: use resolve_rev