/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_reconcile.py

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

Show diffs side-by-side

added

removed

bzrlib/tests/per_branch/test_reconcile.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 

15

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

16

16

 

17

17

"""Tests for branch implementations - test reconcile() functionality"""

18

18

 

19

19

from bzrlib import errors, reconcile

20

 

from bzrlib.tests.branch_implementations import TestCaseWithBranch

 

20

from bzrlib.tests.per_branch import TestCaseWithBranch

21

21

 

22

22

 

23

23

class TestBranchReconcile(TestCaseWithBranch):

43

43

        # Now, try to set an invalid history

44

44

        try:

45

45

            tree.branch.set_revision_history([r1, r2b, r5])

 

46

            if tree.branch.last_revision_info() != (3, r5):

 

47

                # RemoteBranch silently corrects an impossible revision

 

48

                # history given to set_revision_history.  It can be tricked

 

49

                # with set_last_revision_info though.

 

50

                tree.branch.set_last_revision_info(3, r5)

46

51

        except errors.NotLefthandHistory:

47

52

            # Branch5 allows set_revision_history to be wrong

48

53

            # Branch6 raises NotLefthandHistory, but we can force bogus stuff

65

70

        a_branch = self.make_branch('a_branch')

66

71

        a_branch.reconcile(thorough=False)

67

72

        a_branch.reconcile(thorough=True)

 

73

 

 

74

    def test_reconcile_handles_ghosts_in_revhistory(self):

 

75

        tree = self.make_branch_and_tree('test')

 

76

        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)

 

77

        r1 = tree.commit('one')

 

78

        r2 = tree.commit('two')

 

79

        tree.branch.set_last_revision_info(2, r2)

 

80

 

 

81

        reconciler = tree.branch.reconcile()

 

82

        self.assertEquals([r1, r2], tree.branch.revision_history())

• Older »

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