← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_resolve.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-10 22:20:12 UTC
  • mfrom: (5582 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5599.
  • Revision ID: john@arbash-meinel.com-20110110222012-mtcqudkvmzwiufuc
Merge in the bzr.dev 5582

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_resolve.py
1
 
# Copyright (C) 2010 Canonical Ltd
 
1
# Copyright (C) 2010, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
91
91
        self.build_tree_contents([('tree/file', 'a\n')])
92
92
        note = self.run_bzr('resolve', working_dir='tree')[1]
93
93
        self.assertContainsRe(note, 'All conflicts resolved.')
94
 
 
95
 
 
96
 
class TestResolveSilentlyIgnore(script.TestCaseWithTransportAndScript):
97
 
 
98
 
    def test_bug_646961(self):
99
 
        self.run_script("""\
100
 
            $ bzr init base
101
 
            Created a standalone tree (format: 2a)
102
 
            $ cd base
103
 
            $ echo >file1
104
 
            $ bzr add
105
 
            adding file1
106
 
            $ bzr ci -m "stuff"
107
 
            2>Committing to: .../base/
108
 
            2>added file1
109
 
            2>Committed revision 1.
110
 
            $ cd ..
111
 
            $ bzr branch base branch
112
 
            2>Branched 1 revision(s).
113
 
            $ cd base
114
 
            $ echo "1" >> file1
115
 
            $ bzr ci -m "branch 1"
116
 
            2>Committing to: .../base/
117
 
            2>modified file1
118
 
            2>Committed revision 2.
119
 
            $ cd ../branch
120
 
            $ echo "2" >> file1
121
 
            $ bzr ci -m "branch 2"
122
 
            2>Committing to: .../branch/
123
 
            2>modified file1
124
 
            2>Committed revision 2.
125
 
            $ cd ../base
126
 
            $ bzr merge ../branch
127
 
            2> M  file1
128
 
            2>Text conflict in file1
129
 
            2>1 conflicts encountered.
130
 
            # The following succeeds silently without resolving the conflict
131
 
            $ bzr resolve file1 --take-other
132
 
            2>0 conflict(s) resolved, 1 remaining
133
 
            # The following wil fail when --take-other is implemented
134
 
            # for text conflicts
135
 
            $ bzr conflicts
136
 
            Text conflict in file1
137
 
            """)
138