[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] org.debian.monotone: 3fbb46fb17d5bae40fb4e4b5d4
From: |
code |
Subject: |
[Monotone-commits-diffs] org.debian.monotone: 3fbb46fb17d5bae40fb4e4b5d4b71806de896789 |
Date: |
Mon, 11 Mar 2013 21:53:50 +0100 (CET) |
revision: 3fbb46fb17d5bae40fb4e4b5d4b71806de896789
date: 2010-06-23T21:24:25
author: address@hidden
branch: org.debian.monotone
changelog:
- New upstream release.
- Remove backported fixes.
manifest:
format_version "1"
new_manifest [7b41a520abe34455969f4483845e5704cb99c0b0]
old_revision [60ad112b749eb7ca1911855720dbc2adfee88968]
delete "patches/00-push-pull-sync-fail.diff"
delete "patches/10-slow-branchy-ancestry.diff"
patch "changelog"
from [afa7349db75ada400c1d9b047ba09192791c60a9]
to [3fb0b55eac6373b9c163747668dc495a5b1a3241]
patch "patches/series"
from [b8bc8bc5cf8502b5c8645cd8527c29ae48648107]
to [a9cedff979e581682473c4fbc9cc727893cfaa9a]
============================================================
--- changelog afa7349db75ada400c1d9b047ba09192791c60a9
+++ changelog 3fb0b55eac6373b9c163747668dc495a5b1a3241
@@ -1,3 +1,13 @@
+monotone (0.48-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+ - Incorporates 00-push-pull-sync-fail.diff and
+ 10-slow-branchy-ancestry.diff.
+ * Fix monotone-server postrm script to delete auto-generated key during purge.
+ This broke when the filenames of keys started incorporating the key hash.
+
+ -- Francis Russell <address@hidden> Wed, 23 Jun 2010 17:52:34 +0100
+
monotone (0.47-2) unstable; urgency=low
[ Richard Levitte ]
============================================================
--- patches/00-push-pull-sync-fail.diff 1e5aa0c611e5f011560a49a9caa4f9cb8b8884e2
+++ /dev/null
@@ -1,22 +0,0 @@
-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/10-slow-branchy-ancestry.diff 61cfe99d003fbed963e2bb90e9dc3afc9a4a0259
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream changelog:
- fix ancestry checking to not be exponentially slow on branchy ancestry
-
-Backport from revision 911f3ce2c66ade267eec549dc15bcef420a1686d.
-Index: monotone-0.47/database.cc
-===================================================================
---- monotone-0.47.orig/database.cc 2010-06-05 01:36:37.636176391 +0100
-+++ monotone-0.47/database.cc 2010-06-05 01:36:44.581925485 +0100
-@@ -2623,6 +2623,7 @@
-
- vector<revision_id> todo;
- todo.push_back(ancestor);
-+ set<revision_id> seen;
- while (!todo.empty())
- {
- revision_id anc = todo.back();
-@@ -2634,11 +2635,16 @@
- {
- if (*i == child)
- return true;
-+ else if (seen.find(*i) != seen.end())
-+ continue;
- else
- {
- get_rev_height(*i, anc_height);
- if (child_height > anc_height)
-- todo.push_back(*i);
-+ {
-+ seen.insert(*i);
-+ todo.push_back(*i);
-+ }
- }
- }
- }
============================================================
--- patches/series b8bc8bc5cf8502b5c8645cd8527c29ae48648107
+++ patches/series a9cedff979e581682473c4fbc9cc727893cfaa9a
@@ -1,3 +1 @@
-00-push-pull-sync-fail.diff
-10-slow-branchy-ancestry.diff
90-stacktrace-on-crash.diff
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] org.debian.monotone: 3fbb46fb17d5bae40fb4e4b5d4b71806de896789,
code <=