~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/builtins.py

Committer: Martin Pool
Date: 2005-11-22 03:32:37 UTC
mfrom: (1185.35.42 Aaron's mergeable stuff)
mto: (1508.1.15) (1185.74.1 bzr.dev (Main development branch)) (1505.1.19 bzr-bound-branch) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1510.
Revision ID: mbp@sourcefrog.net-20051122033237-5099d6acc4751400

[merge] make sure to get all text revisions during merge (aaron)

added added

removed removed

try:

return inner_branch_files(file_list, default_branch)

except FileInWrongBranch, e:

print file_list

raise BzrCommandError("%s is not in the same branch as %s" %

(e.path, file_list[0]))