1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
# Copyright (C) 2006 Aaron Bentley
# <aaron.bentley@utoronto.ca>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os
from bzrlib.errors import NoSuchFile
from bzrlib.workingtree import WorkingTree
from bzrlib.merge import merge_inner
from bzrlib import trace
def do_shove(source, target):
trace.warning('Shove is deprecated. See merge --uncommitted.')
if not os.path.exists(source):
raise NoSuchFile(source)
if not os.path.exists(target):
raise NoSuchFile(target)
source_tree = WorkingTree.open_containing(source)[0]
target_tree = WorkingTree.open_containing(target)[0]
merge_inner(target_tree.branch, source_tree, source_tree.basis_tree(),
this_tree=target_tree)
|