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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
# Copyright (C) 2005 by Canonical Ltd
#
# 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.builtins import merge
from bzrlib.missing import find_unmerged
from bzrlib.tests import TestCaseWithTransport
from bzrlib.workingtree import WorkingTree
class TestMissing(TestCaseWithTransport):
def test_find_unmerged(self):
original_tree = self.make_branch_and_tree('original')
original = original_tree.branch
puller_tree = self.make_branch_and_tree('puller')
puller = puller_tree.branch
merger_tree = self.make_branch_and_tree('merger')
merger = merger_tree.branch
self.assertEqual(find_unmerged(original, puller), ([], []))
original_tree.commit('a', rev_id='a')
self.assertEqual(find_unmerged(original, puller), ([(1, u'a')], []))
puller_tree.pull(original)
self.assertEqual(find_unmerged(original, puller), ([], []))
merger_tree.pull(original)
original_tree.commit('b', rev_id='b')
original_tree.commit('c', rev_id='c')
self.assertEqual(find_unmerged(original, puller), ([(2, u'b'),
(3, u'c')], []))
puller_tree.pull(original)
self.assertEqual(find_unmerged(original, puller), ([], []))
self.assertEqual(find_unmerged(original, merger), ([(2, u'b'),
(3, u'c')], []))
merge(['original', -1], [None, None], this_dir='merger')
self.assertEqual(find_unmerged(original, merger), ([(2, u'b'),
(3, u'c')], []))
merger_tree.commit('d', rev_id='d')
self.assertEqual(find_unmerged(original, merger), ([], [(2, 'd')]))
|