← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patch.py

  • Committer: abentley
  • Date: 2006-04-20 23:47:53 UTC
  • mfrom: (1681 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1683.
  • Revision ID: abentley@lappy-20060420234753-6a6874b76f09f86d
Merge bzr.dev

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
6
7
"""
7
8
Diff and patch functionality
8
9
"""
51
52
def diff3(out_file, mine_path, older_path, yours_path):
52
53
    def add_label(args, label):
53
54
        args.extend(("-L", label))
 
55
    check_text_path(mine_path)
 
56
    check_text_path(older_path)
 
57
    check_text_path(yours_path)
54
58
    args = ['diff3', "-E", "--merge"]
55
59
    add_label(args, "TREE")
56
60
    add_label(args, "ANCESTOR")