lp:~cjwatson/turnip/merge-prerequisite

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:turnip at revision 182

William Grant: Approve (code) on 2015-09-07

Diff: 141 lines (+68/-17)

3 files modified

turnip/api/store.py (+47/-16)
turnip/api/tests/test_api.py (+18/-0)
turnip/api/views.py (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1489839: Prerequisite handling broken for git merge proposals

High

Fix Released

Link a bug report

Related blueprints

183. By Colin Watson on 2015-09-07

Get the file mode for a conflict from the first suitable existing IndexEntry.

182. By Colin Watson on 2015-08-28

Add an optional sha1_prerequisite parameter to compare-merge API.

181. By Colin Watson on 2015-08-28

Prepare for pygit2 0.23.0: Repository.merge_base might return None.

180. By Colin Watson on 2015-08-28

Remove unused import.

179. By Colin Watson on 2015-07-09

Switch zope.interface users from class advice to class decorators.

178. By William Grant on 2015-06-19

Redirect from / to main_site_root.

177. By William Grant on 2015-06-18

[r=cjwatson] Fix open_repo's ephemeral case and init_repo's clone-of-a-clone case to cope with turnip-subordinate properly.

176. By William Grant on 2015-06-18

Partial Python 3 fixes.

There are still missing Twisted bits (Conch, listenUNIX,
mergeFunctionMetadata), pygit2's Python 3 port erroneously treats
everything as Unicode, and python-openid is broken, but our code is
mostly good.

175. By William Grant on 2015-06-16

Simplify RepoFactory to use bare repos.

174. By William Grant on 2015-06-16

Drop duplicated six version requirement.