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
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp://staging/bzr-keywords
- Jelmer Vernooij (community): Needs Fixing
-
Diff: 30 lines (+12/-1)1 file modifiedkeywords.py (+12/-1)
Branch information
Recent revisions
- 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. - 17. By Jelmer Vernooij
-
merge fix for compressing keywords not in the keyword registry. Thanks Andrew Johnson.
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