← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_uncommit.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 the contract of uncommit on branches.
18
18
 
21
21
 
22
22
from bzrlib.branch import Branch
23
23
from bzrlib import errors
24
 
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
 
24
from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch
25
25
from bzrlib.uncommit import uncommit
26
26
 
27
27
 
34
34
    def capture_post_uncommit_hook(self, local, master, old_revno,
35
35
        old_revid, new_revno, new_revid):
36
36
        """Capture post uncommit hook calls to self.hook_calls.
37
 
        
 
37
 
38
38
        The call is logged, as is some state of the two branches.
39
39
        """
40
40
        if local: