Bazaar

fix file_ids from past svn migration (bzr-svn)

Asked by Jess Balint

Around one year ago, we used bzr-svn to migration a Subversion repository (trunk/tags/branches) to Bazaar. I am trying to merge into trunk from one of the branches. I'm getting a contents conflict on almost every file. I spent some time looking into this and the conclusion I came to is that the file_ids are different where they should be the same. Example:

trunk/CHANGES:
CHANGES 6636@bce1ec22-edf6-0310-a851-a6aae2aa6c29:trunk:CHANGES

branches/branch_5_1/CHANGES:
CHANGES 6634@bce1ec22-edf6-0310-a851-a6aae2aa6c29:branches%2Fbranch_5_1:CHANGES

I'm unable to reproduce this with current versions of the tools (file_ids are the same in a test repo I've setup with a branch similar to this). Is this diagnosis correct, and if so, is there any way to reconcile this?

Many thanks.
Jess

Question information

Language:
English Edit question
Status:
Expired
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Launchpad Janitor (janitor) said : 		#1

This question was expired because it remained in the 'Open' state without activity for the last 15 days.