[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] org.debian.monotone: d97532b8a7f1f96d5e3a872dcd
From: |
code |
Subject: |
[Monotone-commits-diffs] org.debian.monotone: d97532b8a7f1f96d5e3a872dcd4f955e7e0e29bc |
Date: |
Mon, 11 Mar 2013 21:54:48 +0100 (CET) |
revision: d97532b8a7f1f96d5e3a872dcd4f955e7e0e29bc
date: 2010-06-05T00:02:30
author: address@hidden
branch: org.debian.monotone
changelog:
Backport upstream fix for fatal error during sync.
manifest:
format_version "1"
new_manifest [0e1f2cd6a396ad4e84ad5a0820456cfef9e851dd]
old_revision [1f377dcb245a94e998ed33a496cca4dd0683bae9]
add_file "patches/00-push-pull-sync-fail.diff"
content [1e5aa0c611e5f011560a49a9caa4f9cb8b8884e2]
patch "changelog"
from [7860ffa8b683faab041fc39841c4a37567786523]
to [d21019d6fded16e2744bb1c50ff87dafe2dedf76]
patch "patches/series"
from [a9cedff979e581682473c4fbc9cc727893cfaa9a]
to [b1efb9fc2092dbe58edb68cae5848d1665351429]
============================================================
--- changelog 7860ffa8b683faab041fc39841c4a37567786523
+++ changelog d21019d6fded16e2744bb1c50ff87dafe2dedf76
@@ -1,10 +1,14 @@ monotone (0.47-2) UNRELEASED; urgency=lo
monotone (0.47-2) UNRELEASED; urgency=low
+ [ Richard Levitte ]
* Updated the copyright years.
* Added --timestamp to the server startup in monotone-server.
- -- Richard Levitte <address@hidden> Wed, 17 Mar 2010 07:46:15 +0100
+ [ Francis Russell ]
+ * Backport upstream fix for fatal error during sync (closes: #574512).
+ -- Francis Russell <address@hidden> Fri, 04 Jun 2010 23:28:47 +0100
+
monotone (0.47-1) unstable; urgency=low
* New upstream version.
============================================================
--- /dev/null
+++ patches/00-push-pull-sync-fail.diff 1e5aa0c611e5f011560a49a9caa4f9cb8b8884e2
@@ -0,0 +1,22 @@
+Upstream changelog:
+ A regression in 0.47 prevent successful execution of push / pull /
+ sync over pipes (Debian bug 574512); this has been fixed.
+
+Backported from revision cb7a30cbe9fd90d88ea9085f86b4c3f6e5c8fa73.
+
+Index: monotone-0.47/network/reactor.cc
+===================================================================
+--- monotone-0.47.orig/network/reactor.cc 2010-06-04 23:22:26.822163631 +0100
++++ monotone-0.47/network/reactor.cc 2010-06-04 23:22:34.176915430 +0100
+@@ -87,9 +87,9 @@
+ if (i != items.end())
+ {
+ items.erase(i);
+- have_pipe = false;
+- if (readying)
++ if (readying && !have_pipe)
+ item->remove_from_probe(probe);
++ have_pipe = false;
+ }
+ }
+
============================================================
--- patches/series a9cedff979e581682473c4fbc9cc727893cfaa9a
+++ patches/series b1efb9fc2092dbe58edb68cae5848d1665351429
@@ -1 +1,2 @@
+00-push-pull-sync-fail.diff
90-stacktrace-on-crash.diff
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] org.debian.monotone: d97532b8a7f1f96d5e3a872dcd4f955e7e0e29bc,
code <=