← Back to branch summary

~matsubara/tarmac/merge_branches-generator

~matsubara/tarmac/merge_branches-generator

Viewing all changes in revision 386.

Committer: Diogo Matsubara
Date: 2010-11-19 16:57:48 UTC
mfrom: (380.2.10 branch-merger)
Revision ID: diogo.matsubara@canonical.com-20101119165748-iw946b0x3evh4jlv

move most of the merge logic to the tarmac.branch.Branch class

files modified:
tarmac/bin/commands.py

tarmac/branch.py

tarmac/tests/__init__.py

tarmac/tests/mock.py

tarmac/tests/test_branch.py

tarmac/tests/test_commands.py

Show diffs side-by-side

added added

removed removed

tarmac/bin/commands.py

tarmac/branch.py

tarmac/tests/__init__.py

tarmac/tests/mock.py

tarmac/tests/test_branch.py

tarmac/tests/test_commands.py

Older »