/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: Aaron Bentley
  • Date: 2007-03-16 17:47:16 UTC
  • mto: This revision was merged to the branch mainline in revision 2389.
  • Revision ID: abentley@panoramicfeedback.com-20070316174716-0se6k7b4sqr9t12d
test suite fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
569
569
        from bzrlib.tag import _merge_tags_if_possible
570
570
        # FIXME: too much stuff is in the command class
571
571
        rev_id = None
 
572
        mergeable = None
572
573
        if directory is None:
573
574
            directory = u'.'
574
575
        try:
2501
2502
            directory=None,
2502
2503
            ):
2503
2504
        from bzrlib.tag import _merge_tags_if_possible
 
2505
        other_rev_id = None
2504
2506
        if merge_type is None:
2505
2507
            merge_type = _mod_merge.Merge3Merger
2506
2508
 
2521
2523
                mergeable = bundle.read_mergeable_from_url(
2522
2524
                    branch)
2523
2525
            except errors.NotABundle:
2524
 
                other_rev_id = None
2525
2526
                pass # Continue on considering this url a Branch
2526
2527
            else:
2527
2528
                if revision is not None:
2574
2575
                base = [branch, revision[0].in_history(base_branch).revno]
2575
2576
                other = [branch1, revision[1].in_history(other_branch).revno]
2576
2577
 
2577
 
        if tree.branch.get_parent() is None or remember:
 
2578
        if ((tree.branch.get_parent() is None or remember) and
 
2579
            other_branch is not None):
2578
2580
            tree.branch.set_parent(other_branch.base)
2579
2581
 
2580
2582
        # pull tags now... it's a bit inconsistent to do it ahead of copying