lp://staging/~jameinel/loggerhead/merge_point_config

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/loggerhead

Matt Nordhoff: Needs Information on 2010-05-06

Diff: 150 lines (+39/-11)

4 files modified

loggerhead/apps/branch.py (+8/-1)
loggerhead/apps/transport.py (+8/-3)
loggerhead/config.py (+10/-1)
loggerhead/history.py (+13/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

412. By John A Meinel on 2010-04-26

Turn show_merge_points into a config setting.

Today it doesn't cost a whole lot, but with the caching changes, it will
start to cost a bit more.

411. By Matt Nordhoff on 2010-04-24

Don't let properties that start with _ be created in the first place.

410. By Matt Nordhoff on 2010-04-24

Fix infinite recursion when unpickling Containers.

Unpickle tries to access a few attributes (__getstate__, etc.) before filling the __dict__, so __getattr__ went into a loop trying to find self._properties.

It's no longer possible to use properties that start with an underscore, but that's a bit icky anyway.

409. By Ian Clatworthy on 2010-04-23

Skip syntax highlighting on files over 512K

408. By Ian Clatworthy on 2010-04-22

Merge John's minor cleanups

407. By Ian Clatworthy on 2010-04-14

Simplify .bzrignore

406. By Ian Clatworthy on 2010-04-13

Clean-up trailing whitespace

405. By Ian Clatworthy on 2010-04-13

Convert docs to Sphinx format and put into a docs directory

404. By Robert Collins on 2010-04-08

Merge patch from Toshio Kuratomi to work with mod_wsgi - Content-Length must be strings.

403. By Matt Nordhoff on 2010-03-30

Ignore readonly+ prefix when checking if a branch URL is local.