/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/builtins.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-10-19 08:44:55 UTC
  • mfrom: (2091 +trunk)
  • mto: (2145.1.1 keepalive)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: v.ladeuil+lp@free.fr-20061019084455-89d30e66e82b1e52
Merge bzr,dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
849
849
 
850
850
    def run(self, dir='.'):
851
851
        tree = WorkingTree.open_containing(dir)[0]
852
 
        tree.lock_write()
 
852
        master = tree.branch.get_master_branch()
 
853
        if master is not None:
 
854
            tree.lock_write()
 
855
        else:
 
856
            tree.lock_tree_write()
853
857
        try:
854
858
            existing_pending_merges = tree.get_parent_ids()[1:]
855
859
            last_rev = tree.last_revision()
2329
2333
                        interesting_ids.add(ie.file_id)
2330
2334
                new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2331
2335
            else:
2332
 
                restore_files = [c.path for c in conflicts]
 
2336
                # Remerge only supports resolving contents conflicts
 
2337
                allowed_conflicts = ('text conflict', 'contents conflict')
 
2338
                restore_files = [c.path for c in conflicts
 
2339
                                 if c.typestring in allowed_conflicts]
2333
2340
            _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2334
2341
            tree.set_conflicts(ConflictList(new_conflicts))
2335
2342
            if file_list is not None: