1
# Copyright (C) 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20
from bzrlib import BZRDIR
2
21
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
3
22
ReusingTransform, NotVersionedError, CantMoveRoot)
23
from bzrlib.inventory import InventoryEntry
4
24
from bzrlib.osutils import file_kind, supports_executable
5
from bzrlib.inventory import InventoryEntry
6
from bzrlib import BZRDIR
7
from bzrlib.delta import compare_trees
9
from merge3 import Merge3
25
from bzrlib.merge3 import Merge3
11
27
ROOT_PARENT = "root-parent"