← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevision.py

  • Committer: Martin Pool
  • Date: 2005-09-15 08:57:46 UTC
  • Revision ID: mbp@sourcefrog.net-20050915085746-89170eabc66f8b89
- clean up imports

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
 
 
18
import os
 
19
 
17
20
from bzrlib.selftest import TestCaseInTempDir
18
 
 
 
21
from bzrlib.branch import Branch
 
22
from bzrlib.commit import commit
 
23
from bzrlib.fetch import Fetcher
19
24
 
20
25
def make_branches():
21
 
    from bzrlib.branch import Branch
22
 
    from bzrlib.commit import commit
23
 
    import os
24
26
    os.mkdir("branch1")
25
27
    br1 = Branch("branch1", init=True)
26
28
    
34
36
    commit(br2, "Commit four", rev_id="b@u-0-3")
35
37
    commit(br2, "Commit five", rev_id="b@u-0-4")
36
38
    revisions_2 = br2.revision_history()
 
39
    
 
40
    ## Fetch(from_branch=br2, to_branch=br1)
37
41
    br1.add_pending_merge(revisions_2[4])
38
42
    commit(br1, "Commit six", rev_id="a@u-0-3")
39
43
    commit(br1, "Commit seven", rev_id="a@u-0-4")