/brz/remove-bazaar

« back to all changes in this revision

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

• browse files at revision 4912.2.3
• compare with another revision
• compare with revision 5200.3.2
• download diff
• download tarball
• view history from revision 4912.2.3

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_merge.py

1

 

# Copyright (C) 2006, 2007 Canonical Ltd

 

1

# Copyright (C) 2006-2010 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

393

393

    def test_directive_cherrypick(self):

394

394

        source = self.make_branch_and_tree('source')

395

395

        source.commit("nothing")

396

 

        # see https://bugs.edge.launchpad.net/bzr/+bug/409688 - trying to

 

396

        # see https://bugs.launchpad.net/bzr/+bug/409688 - trying to

397

397

        # cherrypick from one branch into another unrelated branch with a

398

398

        # different root id will give shape conflicts.  as a workaround we

399

399

        # make sure they share the same root id.

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0