At http://people.samba.org/bzr/jelmer/bzr-svn/trunk
------------------------------------------------------------
revno: 1738
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Sat 2008-11-08 19:11:39 +0100
message:
Merge upstream.
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 1733.1.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Wed 2008-11-05 20:01:48 +0100
message:
Mention bug #
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
------------------------------------------------------------
revno: 1733.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Wed 2008-11-05 19:58:00 +0100
message:
Fix another bug handling files as tags.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
repository.py
repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'repository.py'
--- a/repository.py 2008-11-03 12:29:56 +0000
+++ b/repository.py 2008-11-05 18:58:00 +0000
@@ -870,7 +870,10 @@
if not changes.changes_path(newpaths, p, False)
and layout.is_branch(cf):
tp = cf
tr = int(self.transport.get_dir(cf,
cr)[2][properties.PROP_ENTRY_COMMITTED_REV])
- tags[p] = self.generate_revision_id(tr, tp,
mapping)
+ try:
+ tags[p] = self.generate_revision_id(tr, tp,
mapping)
+ except SubversionException, (_,
errors.ERR_FS_NOT_DIRECTORY):
+ pass
else:
try:
tags[bp] = self.generate_revision_id(revnum,
bp, mapping, revprops=revprops)
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
