lp://staging/~anj/bzr-keywords/handle-exceptions

Created by Andrew Johnson and last modified

Various repository operations (e.g. rebasing or merging two branches where one has deleted files in it) can generate exceptions during keyword expansion. This branch handles those exceptions and permits the merge to complete normally.

Get this branch:
bzr branch lp://staging/~anj/bzr-keywords/handle-exceptions
Only Andrew Johnson can upload to this branch. If you are Andrew Johnson please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Andrew Johnson
Project:
Bazaar Keywords Plugin
Status:
Mature

Recent revisions

21. By Andrew Johnson

Merged changes from official branch

20. By Andrew Johnson

Handle various exceptions during keyword processing.

These tend to occur during merges or rebasing, when
one side or other has delted files in the tree.

19. By Jelmer Vernooij

Use absolute_import.

18. By Jelmer Vernooij

Merge lazy loading support.

17. By Jelmer Vernooij

merge fix for compressing keywords not in the keyword registry. Thanks Andrew Johnson.

16. By Ian Clatworthy

fix tests to use new bzrlib/tests structure

15. By Ian Clatworthy

finer control over name & email formatting

14. By Ian Clatworthy

use new filter registration API

13. By Ian Clatworthy

tweak NEWS and TODO

12. By Ian Clatworthy

add keywords_in_trees tests and make some code tweaks

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp://staging/bzr-keywords
This branch contains Public information 
Everyone can see this information.

Subscribers