At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1957
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Mon 2008-11-03 15:35:35 +0100
message:
Merge 0.4.14.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
subvertpy/subvertpy/client.c client.pyx-20080313235339-wbyjbw2namuiql8f-1
------------------------------------------------------------
revno: 1669.8.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Mon 2008-11-03 15:10:47 +0100
message:
Start on 0.4.15
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
setup.py setup.py-20060502115218-86950492da22353f
------------------------------------------------------------
revno: 1669.8.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Mon 2008-11-03 14:39:48 +0100
message:
Merge upstream.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
delta.py delta.py-20080316001917-xyng7m3jlxvdc4c9-1
editor.h editor.h-20080602191336-frj7az1sdk13o1tw-2
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
logwalker.py
logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping3/__init__.py
__init__.py-20080502174630-9324zh25kka98vlw-1
ra.c ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
repository.py
repository.py-20060306123302-1f8c5069b3fe0265
tests/test_commit.py
test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_mapping.py
test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
wc.c wc.pyx-20080313142018-10l8l23vha2j9e6b-1
------------------------------------------------------------
revno: 1669.1.68
tags: bzr-svn-0.4.14
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Mon 2008-11-03 14:36:48 +0100
message:
Release 0.4.14.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py
__init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 1669.1.67
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Mon 2008-11-03 13:29:56 +0100
message:
Ignore tags that happen to be files.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
repository.py
repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 1669.8.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Thu 2008-10-30 21:50:59 +0100
message:
Merge win32 fixes from John.
modified:
client.c
client.pyx-20080313235339-wbyjbw2namuiql8f-1
editor.c editor.c-20080602191336-frj7az1sdk13o1tw-1
=== modified file 'NEWS'
--- a/NEWS 2008-11-03 03:55:00 +0000
+++ b/NEWS 2008-11-03 14:35:35 +0000
@@ -60,6 +60,8 @@
+ Standard commit code provides commit notification. (#79333)
+bzr-svn 0.4.14 2008-11-03
+
BUG FIXES
* Fix compatibility with Bazaar 1.9. (#279444)
@@ -71,6 +73,8 @@
* Fix python2.6 deprecation warnings. (#292306)
+ * Ignore tags that happen to be files. (#290664)
+
bzr-svn 0.4.13 2008-09-24
BUG FIXES
=== modified file 'repository.py'
--- a/repository.py 2008-10-02 21:18:28 +0000
+++ b/repository.py 2008-11-03 14:35:35 +0000
@@ -674,7 +674,10 @@
tr = self._log.find_latest_change(cf, cr)
tag_changes[p] = self.generate_revision_id(tr, tp,
mapping)
else:
- tag_changes[bp] =
self._revmeta_provider.get_revision(bp, revnum,
revprops=revprops).get_revision_id(mapping)
+ try:
+ tag_changes[bp] =
self._revmeta_provider.get_revision(bp, revnum,
revprops=revprops).get_revision_id(mapping)
+ except SubversionException, (_,
errors.ERR_FS_NOT_DIRECTORY):
+ pass
for path, revid in tag_changes.items():
name = layout.get_tag_name(path, project)
if revid is None:
=== modified file 'subvertpy/subvertpy/client.c'
--- a/subvertpy/subvertpy/client.c 2008-11-03 03:55:00 +0000
+++ b/subvertpy/subvertpy/client.c 2008-11-03 14:35:35 +0000
@@ -803,6 +803,8 @@
void initclient(void)
{
+ extern void initeditor(void);
+
PyObject *mod;
if (PyType_Ready(&Client_Type) < 0)
@@ -814,6 +816,8 @@
if (PyType_Ready(&ConfigItem_Type) < 0)
return;
+ initeditor();
+
/* Make sure APR is initialized */
apr_initialize();
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
