11
12
from bzrlib.inventory import ROOT_ID
12
13
from bzrlib.errors import BzrCommandError, NotAncestor
13
14
from bzrlib.trace import warning, mutter
14
15
from collections import deque
15
16
from bzrlib.revision import (common_ancestor, MultipleRevisionSources,
16
17
get_intervening_revisions, NULL_REVISION)
18
18
from bzrlib.diff import internal_diff, compare_trees
20
20
class MetaInfoHeader(object):