/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2008-04-04 00:43:07 UTC
  • mfrom: (3331 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3333.
  • Revision ID: robertc@robertcollins.net-20080404004307-0whomfhm3yal2rvw
Resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008 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
110
110
        b.pull(t_a.branch)
111
111
        uncommit.uncommit(b)
112
112
 
 
113
    def test_uncommit_bound_local(self):
 
114
        t_a = self.make_branch_and_tree('a')
 
115
        rev_id1 = t_a.commit('commit 1')
 
116
        rev_id2 = t_a.commit('commit 2')
 
117
        rev_id3 = t_a.commit('commit 3')
 
118
        b = t_a.branch.create_checkout('b').branch
 
119
 
 
120
        out, err = self.run_bzr(['uncommit', '--local', 'b', '--force'])
 
121
        self.assertEqual(rev_id3, t_a.last_revision())
 
122
        self.assertEqual((3, rev_id3), t_a.branch.last_revision_info())
 
123
        self.assertEqual((2, rev_id2), b.last_revision_info())
 
124
 
113
125
    def test_uncommit_revision(self):
114
126
        wt = self.create_simple_tree()
115
127