lp://qastaging/~jelmer/wikkid/dulwich

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/wikkid at revision 74

Tim Penhey: Approve on 2014-04-07

Gavin Panella: Approve on 2013-12-18

Diff: 522 lines (+362/-16)

12 files modified

bin/wikkid-serve (+18/-8)
setup.py (+1/-0)
wikkid/dispatcher.py (+1/-1)
wikkid/filestore/basefile.py (+1/-2)
wikkid/filestore/bzr.py (+2/-1)
wikkid/filestore/git.py (+205/-0)
wikkid/filestore/volatile.py (+2/-1)
wikkid/interface/filestore.py (+0/-3)
wikkid/tests/__init__.py (+1/-0)
wikkid/tests/filestore.py (+2/-0)
wikkid/tests/test_git_filestore.py (+55/-0)
wikkid/user/git.py (+74/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

81. By Jelmer Vernooij on 2014-01-16

Move extra code out of try/except.

80. By Jelmer Vernooij on 2014-01-16

Use posixpath.sep rather than /

79. By Jelmer Vernooij on 2014-01-16

Add dulwich dependency.

78. By Jelmer Vernooij on 2014-01-15

Merge trunk.

77. By Jelmer Vernooij on 2013-09-02

Fix user id.

76. By Jelmer Vernooij on 2013-09-02

Simplify commit, add --format=git option.

75. By Jelmer Vernooij on 2013-09-02

fix most tests.

74. By Jelmer Vernooij on 2013-09-01

Support file conflicts.

73. By Jelmer Vernooij on 2013-09-01

Bunch of test fixes.

72. By Jelmer Vernooij on 2013-09-01

Fix test name.