[Xen-devel] Handling of subarch rename

["Jacob Gorm Hansen" <jacobg@xxxxxxx>]

hi,

when trying to merge some old xen-3.0 code to xen-3.0.2, I bumped into
the large linux 'subarch' rename which mercurial cannot merge on its
own. Does anyone have an automated way of merging around this, other
than the giant edit-patch-apply-hg-revert cycle?

thanks,
Jacob

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel