[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] broken merger
From: |
graydon hoare |
Subject: |
[Monotone-devel] broken merger |
Date: |
08 Sep 2003 09:59:41 -0400 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 |
hi,
the line-level merge3 operator is currently broken. if you do any
monotone commands which use it (update, merge) there is a very good
chance they will fail silently (report success, mangle data). I am
investigating and will post a fix shortly. in the interim, you can
hobble along well enough by applying these patches to your local copy
(you may already have the fix to std_hooks.lua, as it is in CVS).
this will just temporarily force all your file-level merges (two
people edited the same file) to be hand-resolved in emacs.
-graydon
--- diff_patch.cc 29 Aug 2003 21:40:05 -0000 1.5
+++ diff_patch.cc 8 Sep 2003 13:58:50 -0000
@@ -344,6 +344,7 @@
vector<string> const & right,
vector<string> & merged)
{
+ return false;
try
{
vector<size_t> leftpos;
--- std_hooks.lua 9 Apr 2003 13:19:23 -0000 1.1
+++ std_hooks.lua 8 Sep 2003 12:49:08 -0000 1.2
@@ -167,7 +167,7 @@
end
-- read in the results
- tmp = openfile(outfile, "w+")
+ tmp = openfile(outfile, "r")
if (tmp == nil) then
return nil
end
-graydon
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-devel] broken merger,
graydon hoare <=