[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone: 1dd177526ab24400396a8309ede
From: |
code |
Subject: |
[Monotone-commits-diffs] net.venge.monotone: 1dd177526ab24400396a8309ede1979444c47b4c |
Date: |
Fri, 1 Mar 2013 22:59:59 +0100 (CET) |
revision: 1dd177526ab24400396a8309ede1979444c47b4c
date: 2013-03-01T21:59:26
author: Richard Hopkins <address@hidden>
branch: net.venge.monotone
changelog:
Read merge result file in binary after invoking user's merge3 tool
I forgot to specify this in the call to read_contents_of_file in
d2c56ab00604e0e40d76125b8b320211e62c1822; that's when the merge3
files started to be written in binary mode to deal with Windows
newlines.
manifest:
format_version "1"
new_manifest [a6033c05c78f0213d11d5fc4cca32ef46f70f9b3]
old_revision [83ae9d988242e19336bc65a5b3b084d244932ff8]
patch "src/std_hooks.lua"
from [54ec386116ab1377c7d1c3d9093dfb7e9eb81358]
to [7e694c8f47f34cc2491f078ce6cd514fa349755b]
============================================================
--- src/std_hooks.lua 54ec386116ab1377c7d1c3d9093dfb7e9eb81358
+++ src/std_hooks.lua 7e694c8f47f34cc2491f078ce6cd514fa349755b
@@ -956,7 +956,7 @@ function merge3 (anc_path, left_path, ri
if not ret then
ret = nil
else
- ret = read_contents_of_file (ret, "r")
+ ret = read_contents_of_file (ret, "rb")
if string.len (ret) == 0
then
ret = nil
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone: 1dd177526ab24400396a8309ede1979444c47b4c,
code <=