← Back to branch summary

~bzr/ubuntu/lucid/bzr/beta-ppa

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Martin Pool
  • Date: 2010-07-02 07:29:40 UTC
  • mfrom: (129.1.7 packaging-karmic)
  • Revision ID: mbp@sourcefrog.net-20100702072940-hpzq5elg8wjve8rh
http://bugs.debian.org/452024
http://bugs.debian.org/464688
http://bugs.debian.org/523595
http://bugs.debian.org/526233
http://bugs.debian.org/537708
http://bugs.debian.org/555336
http://bugs.debian.org/555343
https://launchpad.net/bugs/249452
https://launchpad.net/bugs/385074
* PPA rebuild.
* PPA rebuild for Karmic.
* PPA rebuild for Jaunty.
* PPA rebuild for Hardy.
* From postinst, actually remove the example bash completion scripts.
  (LP: #249452)
* New upstream release.
* New upstream release.
* New upstream release.
* Revert change to Build-depends: Dapper does not have python-central.
  Should be python-support..
* Target ppa..
* Target ppa..
* Target ppa..
* Target ppa..
* New upstream release.
* Switch to dpkg-source 3.0 (quilt) format.
* Bump standards version to 3.8.4.
* Remove embedded copy of python-configobj. Closes: #555336
* Remove embedded copy of python-elementtree. Closes: #555343
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* debian/control: Fix obsolete-relation-form-in-source
  lintian warning. 
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Split out docs into bzr-doc package.
* New upstream release.
* Added John Francesco Ferlito to Uploaders.
* Fix install path to quick-reference guide
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again, again.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to path changes.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Bump standards version to 3.8.3.
* Remove unused patch system.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix copy and paste tab error in .install file
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
 + Fixes compatibility with Python 2.4. Closes: #537708
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream version.
* Bump standards version to 3.8.2.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add python-pyrex to build-deps to ensure C extensions are always build.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix API compatibility version. (Closes: #526233)
* New upstream release.
  + Fixes default format for upgrade command. (Closes: #464688)
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add missing dependency on zlib development library. (Closes:
  #523595)
* Add zlib build-depends.
* Add zlib build-depends.
* Add zlib build-depends.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Move to section vcs.
* Bump standards version to 3.8.1.
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Recommend ca-certificates. (Closes: #452024)
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Update watch file. bazaar now uses launchpad to host its sources.
* Remove patch for inventory root revision copy, applied upstream.
* New upstream release.
* New upstream release.
* New upstream release
* Force removal of files installed in error to /etc/bash_completion.d/
  (LP: #249452)
* New upstream release.
* New upstream release
* New upstream release.
* Bump standards version.
* Include patch for inventory root revision copy, required for bzr-svn.
* New upstream release.
* Remove unused lintian overrides.
* Correct the package version not to be native.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Final 1.5 release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add myself as a co-maintainer.
* Add a Dm-Upload-Allowed: yes header.
* New upstream bugfix release.
* New upstream release.
* Final 1.3 release.
* New upstream release.
* First release candidate of the upcoming 1.3 release.
* Rebuild to fix the problem caused by a build with a broken python-central.
* New upstream release.
* Rebuild for dapper PPA.
* Apply Lamont's patches to fix build-dependencies on dapper.
  (See: https://bugs.launchpad.net/bzr/+bug/189915)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
 
2
#
 
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.
 
7
#
 
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.
 
12
#
 
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
import os
 
19
import shutil
 
20
 
 
21
from bzrlib import check, osutils
 
22
from bzrlib.branch import Branch
 
23
from bzrlib.errors import PointlessCommit, BzrError
 
24
from bzrlib.tests import (
 
25
    SymlinkFeature,
 
26
    TestCaseWithTransport,
 
27
    )
 
28
from bzrlib.tests.test_revision import make_branches
 
29
 
 
30
 
 
31
class TestCommitMerge(TestCaseWithTransport):
 
32
    """Tests for committing the results of a merge.
 
33
 
 
34
    These don't currently test the merge code, which is intentional to
 
35
    reduce the scope of testing.  We just mark the revision as merged
 
36
    without bothering about the contents much."""
 
37
 
 
38
    def test_merge_commit_empty(self):
 
39
        """Simple commit of two-way merge of empty trees."""
 
40
        wtx = self.make_branch_and_tree('x')
 
41
        base_rev = wtx.commit('common parent')
 
42
        bx = wtx.branch
 
43
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
44
        by = wty.branch
 
45
 
 
46
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
47
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
 
48
 
 
49
        by.fetch(bx)
 
50
        # just having the history there does nothing
 
51
        self.assertRaises(PointlessCommit,
 
52
                          wty.commit,
 
53
                          'no changes yet', rev_id='y@u-0-2',
 
54
                          allow_pointless=False)
 
55
        wty.merge_from_branch(bx)
 
56
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
57
 
 
58
        self.assertEquals(by.revno(), 3)
 
59
        self.assertEquals(list(by.revision_history()),
 
60
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
 
61
        rev = by.repository.get_revision('y@u-0-2')
 
62
        self.assertEquals(rev.parent_ids,
 
63
                          ['y@u-0-1', 'x@u-0-1'])
 
64
 
 
65
    def test_merge_new_file(self):
 
66
        """Commit merge of two trees with no overlapping files."""
 
67
        wtx = self.make_branch_and_tree('x')
 
68
        base_rev = wtx.commit('common parent')
 
69
        bx = wtx.branch
 
70
        wtx.commit('establish root id')
 
71
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
72
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
 
73
        by = wty.branch
 
74
 
 
75
        self.build_tree(['x/ecks', 'y/why'])
 
76
 
 
77
        wtx.add(['ecks'], ['ecks-id'])
 
78
        wty.add(['why'], ['why-id'])
 
79
 
 
80
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
 
81
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
 
82
 
 
83
        wty.merge_from_branch(bx)
 
84
 
 
85
        # partial commit of merges is currently not allowed, because
 
86
        # it would give different merge graphs for each file which
 
87
        # might be complex.  it can be allowed in the future.
 
88
        self.assertRaises(Exception,
 
89
                          wty.commit,
 
90
                          'partial commit', allow_pointless=False,
 
91
                          specific_files=['ecks'])
 
92
 
 
93
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
 
94
        tree = by.repository.revision_tree('y@u-0-2')
 
95
        inv = tree.inventory
 
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
 
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
 
98
 
 
99
        check.check_dwim(bx.base, False, True, True)
 
100
        check.check_dwim(by.base, False, True, True)
 
101
 
 
102
    def test_merge_with_symlink(self):
 
103
        self.requireFeature(SymlinkFeature)
 
104
        tree_a = self.make_branch_and_tree('tree_a')
 
105
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
 
106
        tree_a.add('link')
 
107
        tree_a.commit('added link')
 
108
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
109
        self.build_tree(['tree_a/file'])
 
110
        tree_a.add('file')
 
111
        tree_a.commit('added file')
 
112
        self.build_tree(['tree_b/another_file'])
 
113
        tree_b.add('another_file')
 
114
        tree_b.commit('add another file')
 
115
        tree_b.merge_from_branch(tree_a.branch)
 
116
        tree_b.commit('merge')