← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patch.py

  • Committer: Robert Collins
  • Date: 2006-03-28 14:29:13 UTC
  • mto: (1626.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1628.
  • Revision ID: robertc@robertcollins.net-20060328142913-ac5afb37075719c6
Convert log to use the new tsort.merge_sort routine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patch.py
3
3
from subprocess import Popen, PIPE
4
4
 
5
5
from bzrlib.errors import NoDiff3
6
 
from bzrlib.textfile import check_text_path
7
6
"""
8
7
Diff and patch functionality
9
8
"""
52
51
def diff3(out_file, mine_path, older_path, yours_path):
53
52
    def add_label(args, label):
54
53
        args.extend(("-L", label))
55
 
    check_text_path(mine_path)
56
 
    check_text_path(older_path)
57
 
    check_text_path(yours_path)
58
54
    args = ['diff3', "-E", "--merge"]
59
55
    add_label(args, "TREE")
60
56
    add_label(args, "ANCESTOR")