/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/transform.py

  • Committer: Vincent Ladeuil
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-02 00:50:50 UTC
  • mfrom: (6862.6.1 merge-modified)
  • Revision ID: v.ladeuil+lp@free.fr-20180302005050-un4g1x3py5hsgelo
Allow working trees to not implement set_merge_modified.

Merged from https://code.launchpad.net/~jelmer/brz/merge-modified/+merge/339727

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
2859
2859
            trace.warning(unicode(conflict))
2860
2860
        pp.next_phase()
2861
2861
        tt.apply()
2862
 
        working_tree.set_merge_modified(merge_modified)
 
2862
        try:
 
2863
            working_tree.set_merge_modified(merge_modified)
 
2864
        except errors.UnsupportedOperation:
 
2865
            pass  # well, whatever.
2863
2866
    finally:
2864
2867
        target_tree.unlock()
2865
2868
        tt.finalize()