duplicity-team team mailing list archive

[Kenneth Loafman <kenneth@xxxxxxxxxxx>]

Tried the merge.  Looks like we're using differ bzr versions.

ken@stealth:~/workspace/duplicity-0.7-series$ bzr merge lp:~mterry/duplicity/backend-log-codes
Doing on-the-fly conversion from RemoteRepositoryFormat(_network_name='Bazaar repository format 2a (needs bzr 1.16 or later)\n') to RepositoryFormatKnitPack1().
This may take some time. Upgrade the repositories to the same format for better performance.
bzr: ERROR: KnitPackRepository('file:///home/ken/workspace/duplicity-0.7-series/.bzr/repository/')                                         
is not compatible with
RemoteRepository(bzr+ssh://bazaar.launchpad.net/~mterry/duplicity/backend-log-codes/.bzr/)
different rich-root support

-- 
https://code.launchpad.net/~mterry/duplicity/backend-log-codes/+merge/25373
Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/backend-log-codes into lp:duplicity.