← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset/apply_changeset.py

  • Committer: Aaron Bentley
  • Date: 2006-05-17 16:15:13 UTC
  • mto: (1185.82.108 w-changeset)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: abentley@panoramicfeedback.com-20060517161513-55a87bb608a1583c
Cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset/apply_changeset.py
3
3
This contains the apply changset function for bzr
4
4
"""
5
5
 
6
 
import bzrlib
7
6
import os
8
7
import sys
9
8
from cStringIO import StringIO
10
9
import tempfile
11
10
import shutil
12
11
 
 
12
import bzrlib
 
13
from bzrlib.diff import compare_trees
 
14
from bzrlib.errors import BzrCommandError, RevisionAlreadyPresent
 
15
from bzrlib.merge import merge_inner
 
16
from bzrlib.revision import common_ancestor
 
17
from bzrlib.trace import mutter, warning
 
18
from bzrlib.tree import EmptyTree
 
19
import bzrlib.ui
13
20
from bzrlib.xml5 import serializer_v5
14
 
from bzrlib.trace import mutter, warning
15
 
from bzrlib.revision import common_ancestor
16
 
from bzrlib.merge import merge_inner
17
 
from bzrlib.errors import BzrCommandError, RevisionAlreadyPresent
18
 
from bzrlib.diff import compare_trees
19
21
from bzrlib.osutils import sha_string, split_lines
20
 
import bzrlib.ui
21
 
from bzrlib.tree import EmptyTree
22
22
 
23
23
 
24
24
def _install_info(repository, cset_info, cset_tree):