← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_uncommit.py
16
16
 
17
17
"""Tests of the parent related functions of WorkingTrees."""
18
18
 
19
 
import os
20
 
 
21
19
from bzrlib import (
22
 
    errors,
23
 
    revision as _mod_revision,
24
 
    symbol_versioning,
25
20
    uncommit,
26
21
    )
27
22
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree