# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: larry+launchpad@l2g.to-20090817012902-bfsivog9m26d1ota # target_branch: bzr+ssh://bazaar.launchpad.net/%7Ebzr/bzr-hg/trunk/ # testament_sha1: f7bb6bc037e6a71635ca22678d5bc69f1830d3bd # timestamp: 2009-08-16 18:29:23 -0700 # base_revision_id: jelmer@samba.org-20090718192021-4ioi4xilway92r27 # # Begin patch === modified file '__init__.py' --- __init__.py 2009-07-18 19:20:21 +0000 +++ __init__.py 2009-08-17 01:29:02 +0000 @@ -18,9 +18,11 @@ """Hg support for bzr. -hg and bzr have different restrictions placed n revision ids. Its not possible -with the current hg model to allow bzr to write sanely to hg. However its -possibe to get bzr data out of hg. +Remote hg repositories are not supported at this time. + +hg and bzr have different restrictions placed on revision IDs. It's not +possible with the current hg model to allow bzr to write sanely to hg. However, +it's possible to get bzr data out of hg. The key translations needed are: * in bzr we use a revision id of "hg:" + hex(hgrevid) to ensure we can # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTGLHsYAAXzfgAAQUe///1bk nAC////wUAP48AntXbZDp0JJVD9SfoTKb0p6h6ExPUfqnqZGgGmjQehDmmJgATABMAAJgACYNT0R olPCMjSaMjRo0MgNMj1GmhoEkhJtU/Sm3qoaNGE9Q0NGgANA0aAkkEZBoSbJoKT2hlE2nqZCBoyB r1vLSffSLH2wcoLpFKsCwgAMRQvRbPqgzXh4SJIu2BntkQT2NCEOFcx2YTvHrSf2O37KQT5wUTxZ rn8WKVJmyVTVTxmaiaVBjNJKmYiGKAUL8LJ43QqnS/HHbpTjlcmXBFquwncN7xF3heaO86JZa7B4 4JC24GQe8W6qTbso8O4PqqksR+WFnxRfZWK1naDAsBeInBEg7UeRIiIDxHYlWfCZBk6lYPye86Gd gr77sKHqWG8UTpWHCANEt9PbiKgu7Zt2gsUdCoMSouGdVh9hYbGuGKhEzqSOqV4U1YxNswuyMDQI EpMX2qJqUHFA2hrtGnPdNPvGuiOw0KiuJufGJ3KsVo2EjIBzg0rCORJZmZBGRM4FtomDf/RhbRRu KzUzpQUBFhWG28MSRE9gq62nkyYqT7y0EM4r0jQQ7URVvpiFzWoS9M5GHWLdCxQMUVnOkAs5cRtu TcuYCS7vHVHA9nulY5aylF9zOQBL/fYwF4gXA2YqCZxlxzG+f3VkArtMYaHiG2PVKXRAmL6ol2yi 4pBKHzDz2nuOxIMyXxF3HG9cw9fzLjiON5EWcymg14usudkowhrHi1kmT9oqElFNeRNLITsMoewh fc6PL/t3h4MnDzi7ipjG48jA2eUj1Jci62ATFGIdONBxjhz7gwePEipMkzqZaQhbzVhiTlLV3W8K B7FexmLCeJQc4Bly+Tqh58mV2W6KvMSuGZsAQHpbBeIpUL/H66ZnAHVtTF4PilnBPuDCQ2LdkM4y Lsugt4OVE7fAUSOlmX7hvPzhgQPwxQXqVNZO/IyVWWtVklIWXJPUfv3JU1yVhEY3xI3whFoTvCPu FuUwgxWF/5QJmnXvtJ6lcRmgyUSOCUXMEHQeHzZReo1CgyGXXmkcrcZHeKsKMPZLzaKJB9gaxZpy YO89BXDsLdP/i/ok2uuqiSCJasx3TcpzGyX0OpocWsXYGReHOPto7fU4TwvwdRk+YGljU0o5FrAr nAEWBBIbWKXlziHnhyHL/QkCe494ZcFiQJILe8UJKZAasGknPvwjywyg6qL8f8p6c4j1L1JkGDYx FoXmOJOpyqiOT/Jwc0phC1OG+2K2UoGehhtSlNWbMvYosAiwVUKBC2g3eFSiY1cnpMNQuCL5PsJe C/Au5IpwoSBjFj2M