4 Oct 04:42
[MERGE][bzr-git] fix import of versionedfiles in bzr-git
From: Elliot Murphy <elliot <at> canonical.com>
Subject: [MERGE][bzr-git] fix import of versionedfiles in bzr-git
Newsgroups: gmane.comp.version-control.bazaar-ng.general
Date: 2008-10-04 02:44:56 GMT
Subject: [MERGE][bzr-git] fix import of versionedfiles in bzr-git
Newsgroups: gmane.comp.version-control.bazaar-ng.general
Date: 2008-10-04 02:44:56 GMT
Apologies if this patch should go to a different list, I didn't see any note on the launchpad project page. Here is a tiny import fix for bzr-git that allows it to load on my machine. -- Elliot Murphy | https://launchpad.net/~statik/
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: elliot <at> elliotmurphy.com-20081004023723-carx43s8xdgf1l9z
# target_branch: bzr+ssh://statik <at> bazaar.launchpad.net/%7Ebzr/bzr-\
# git/trunk/
# testament_sha1: c8fd3016115f953fff02bc6e65aac52ae1a9249e
# timestamp: 2008-10-03 22:37:36 -0400
# base_revision_id: jelmer <at> samba.org-20080910111436-89veglifyh2v9ate
#
# Begin patch
=== modified file 'repository.py'
--- repository.py 2008-09-01 15:42:59 +0000
+++ repository.py 2008-10-04 02:37:23 +0000
@@ -34,7 +34,7 @@
)
from bzrlib.transport import get_transport
-from bzrlib.plugins.git import (
+from bzrlib.plugins.git.foreign import (
versionedfiles
)
from bzrlib.plugins.git.mapping import default_mapping
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZRaER8AAV1fgAAQUWP//1IC
lAC//99wUANa86K69eqB3Q0SZJsUAyNMmT1NMjQyaZA0GUmTSemm1QNDygAAAAAkhCmmamoG00jT
QBo0AA9QSVNQemoNqA9QBoBtQ0AAJJAgajJpkyBPVMaCbUYIyNF2Jm9r8jTNUGVjTrKJAckYRGlo
y/KcJu1MM3z6qknylNAQb2D9l7Gpx8JScHxAHkwDjZTFuXbdHvfOGsiQiF6DD8LXdtNR7hIU14i5
fFRqhSll9Xh8wVpxdnh1REVs3eOguAJle54oieaDh4wiJsvCA+RMYaB9c8NUXqU4GgsEZ2iosKpJ
XjTqFig8VQHLVBBIfSYGB4dBTvZCrWqw2ixtKBPJk9ZSFhSVdicKTKuVjQVY8iLZgbi+gVTWiYrM
VBy8BNvLi83avpWmZImXb4lpOb8Sgl69htoUGUYuNdCrMoDxjAsF4iJq2ml1oXxHBS8AsChQjVwk
XzmwgzgzJVVaUER6zMB5/lWZFazFTJn5smNifYVhHuLfyOYXkxjlKrNGzB+9wfl+DorEnKM8Z0rA
i5hmb6b9dLvf9ev26Mq5lbMDOJ9NbyPIGgGwzOR14G4ypUyARYDyarqaLiKlUKixcOBsHEg0HnPJ
pnBpKRF5niU4a6Gl6JV5ZE+ZvNWJNWkk6aNxrs6izPmR6THIMgkYGzvC4Kcs1pAnFFga2AOotI8L
BSR/SLEBUkwHlhXgHbLeGGZFVAUJ2W/IXsaGRvOZxJnxpVsvn6JJWEBRANBLBUi0d2ZXcYyb+qWU
yHAaZRWHADBaY1Nl7opIm4kru04hE4L+hOr75vjegsSVYFAPXfZkPlhmxuLwivMVAQxsVSS0+MRL
Rg5R4eAFSpDvYiGmesxpltIHFJoXMlmSgDxvbo7YDMhlvupbECAHkz0TCXQGWCeJlECbJXVl996g
SCwCx5VrW6qoaSvie3c5FgP5OiLm8q0usZPoCqWD1twhcFwFEhhmNQnCt9RQKhm0OofsxVTWBruU
WLOqInWj5ufa8yaV8G8vm7F2BZZaQMSaDnKRFaRMYd4xdCX9OltVKtKaBhAsj3i6Cckpy49ihKA3
kn3HEtAtVpb2/4u5IpwoSEotCI+A
RSS Feed