~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2011-09-06 10:11:54 UTC
mfrom: (6123.4.8 ghost-tags)
mto: (6112.5.10 i18n-errors) (6123.9.6 more-foreign-tests-fixes-2) (6118.1.5 i18n-options-3) (6110.7.8 i18n-topic-help) (6092.2.11 i18n-nulltranslations) (6082.5.18 expand-in-stack)
mto: This revision was merged to the branch mainline in revision 6124.
Revision ID: pqm@pqm.ubuntu.com-20110906101154-46kb97u5tdj9enyi

(jelmer) Allow tag implementations to not support ghost revisions. (Jelmer
Vernooij)

added added

removed removed

225

value in SI format (i.e. "20MB", "1GB") into its integer equivalent.

226

(Shannon Weyrick)

227

228

* ``Tags`` containers can now declare whether they support versioned

229

tags and whether tags can refer to ghost tags.

230

(Jelmer Vernooij)

231

228

232

* ``Tags.merge_to`` now returns a dictionary with the updated tags

229

233

and a set of conflicts, rather than just conflicts. (Jelmer Vernooij)

230

234