~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/builtins.py

Committer: Robert Collins
Date: 2005-09-16 10:45:59 UTC
mfrom: (1185.3.16)
mto: (1185.41.1 bzr.sftp) (1092.3.4) (1417.1.4) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores) (1393.1.21)
mto: This revision was merged to the branch mainline in revision 1390.
Revision ID: robertc@robertcollins.net-20050916104558-57dc824c64873725

merge up with martin I hope... default merge base told me I was adding builtins.py ..

added added

removed removed

1295

print "Using last location: %s" % parent

1296

remote = parent

1297

elif parent is None:

1298

# We only update parent if it did not exist, missing should not change the parent

1298

# We only update parent if it did not exist, missing

1299

# should not change the parent

1299

1300

b.set_parent(remote)

1300

1301

br_remote = Branch.open_containing(remote)

1301

1302

return show_missing(b, br_remote, verbose=verbose, quiet=quiet)

1303

1304

1305

1306

1305

class cmd_plugins(Command):

1307

1306

"""List plugins"""

1308

1307

hidden = True