← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_textfile.py

  • Committer: John Arbash Meinel
  • Date: 2008-03-04 14:25:46 UTC
  • mto: This revision was merged to the branch mainline in revision 3279.
  • Revision ID: john@arbash-meinel.com-20080304142546-zuwwy0o9roo14928
Implement cherrypick support for Merge3
When merging a cherrypick, use a slightly different resolve logic.
When encountering a conflict, the new logic does not include lines that
were present in BASE that are conflicting with OTHER.
This is done since a cherrypick is (by definition) avoiding changes that
are present in the base.
(related to bug #151731)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_textfile.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from StringIO import StringIO
18
18
 
41
41
class TextPath(TestCaseInTempDir):
42
42
 
43
43
    def test_text_file(self):
44
 
        with file('boo', 'wb') as f: f.write('ab' * 2048)
 
44
        file('boo', 'wb').write('ab' * 2048)
45
45
        check_text_path('boo')
46
 
        with file('boo', 'wb') as f: f.write('a' * 1023 + '\x00')
 
46
        file('boo', 'wb').write('a' * 1023 + '\x00')
47
47
        self.assertRaises(BinaryFile, check_text_path, 'boo')