← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-18 10:42:07 UTC
  • mfrom: (6437.3.6 2.5)
  • mto: (6437.3.7 2.5)
  • mto: This revision was merged to the branch mainline in revision 6441.
  • Revision ID: jelmer@vernstok.nl-20120118104207-yc5fhsaz4mupjcam
Merge 2.5 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1444
1444
        else:
1445
1445
            dir = controldir.ControlDir.open_containing(location)[0]
1446
1446
            try:
1447
 
                active_branch = dir.open_branch(name=None)
 
1447
                active_branch = dir.open_branch(name="")
1448
1448
            except errors.NotBranchError:
1449
1449
                active_branch = None
1450
1450
            branches = dir.get_branches()
1451
1451
            names = {}
1452
1452
            for name, branch in branches.iteritems():
1453
 
                if name is None:
 
1453
                if name == "":
1454
1454
                    continue
1455
1455
                active = (active_branch is not None and
1456
1456
                          active_branch.base == branch.base)
4168
4168
    Merge will do its best to combine the changes in two branches, but there
4169
4169
    are some kinds of problems only a human can fix.  When it encounters those,
4170
4170
    it will mark a conflict.  A conflict means that you need to fix something,
4171
 
    before you should commit.
 
4171
    before you can commit.
4172
4172
 
4173
4173
    Use bzr resolve when you have fixed a problem.  See also bzr conflicts.
4174
4174