← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

Committer: Robert Collins
Date: 2006-02-13 23:19:29 UTC
mfrom: (1185.50.74 bzr-jam-integration)
mto: (1534.11.2 test-pb) (1185.50.76 bzr-jam-integration) (1559.1.1 integration) (1556.1.2 versioned-file-new-repo-format) (1704.1.1 integration)
mto: This revision was merged to the branch mainline in revision 1554.
Revision ID: robertc@robertcollins.net-20060213231929-686f2e0d9859cd83

Merge from jam-integration.

Show diffs side-by-side

added added

removed removed

bzrlib/status.py

74

74

old = branch.repository.revision_tree(rev_id)

75

75

except NoSuchRevision, e:

76

76

raise BzrCommandError(str(e))

77

if len(revision) > 1:

77

if (len(revision) > 1) and (revision[1].spec is not None):

78

78

try:

79

79

rev_id = revision[1].in_history(branch).rev_id

80

80

new = branch.repository.revision_tree(rev_id)

Older »