← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patch.py

Merge bzr.dev (and fix NEWS)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patch.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from __future__ import absolute_import
18
17
 
19
18
import errno
20
19
import os
49
48
    if status < 0:
50
49
        raise Exception("%s killed by signal %i" (args[0], -status))
51
50
    return stdout, stderr, status
52
 
 
 
51
    
53
52
 
54
53
def patch(patch_contents, filename, output_filename=None, reverse=False):
55
54
    """Apply a patch to a file, to produce another output file.  This is should
73
72
        args.extend(("-o", output_filename))
74
73
    args.append(filename)
75
74
    stdout, stderr, status = write_to_cmd(args, patch_contents)
76
 
    return status
 
75
    return status 
77
76
 
78
77
 
79
78
def diff3(out_file, mine_path, older_path, yours_path):