upmerge should respect branches and bookmarks (for mercurial)