Bazaar Subversion Plugin

Fixing bad SVN merge

Asked by Eric Berry

I've been using bzr as a svn client replacement.

When I perform merges using Bazaar everything is great, and when other developers merge properly with their own svn clients, everything works fine.

However, recently another developer performed a SVN merge with an older client that didn't update the svn merge info.

Now when I try to do a merge using bzr-svn it shows all the files that were touched during his merge as having text conflicts.

Is there a way for me to fix this from the bzr-svn perspective? When he does a merge using SVN, it doesn't show those files as conflicts.

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Subversion Plugin Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Jelmer Vernooij (jelmer) said : 		#1

On 03/13/10 02:34, Eric Berry wrote:
> New question #104166 on Bazaar Subversion Plugin:
> https://answers.launchpad.net/bzr-svn/+question/104166
>
> I've been using bzr as a svn client replacement.
>
> When I perform merges using Bazaar everything is great, and when other developers merge properly with their own svn clients, everything works fine.
>
> However, recently another developer performed a SVN merge with an older client that didn't update the svn merge info.
>
> Now when I try to do a merge using bzr-svn it shows all the files that were touched during his merge as having text conflicts.
>
> Is there a way for me to fix this from the bzr-svn perspective? When he does a merge using SVN, it doesn't show those files as conflicts.
>
 svn is probably using its own markers to indicate what revisions of
files have already been merged.

I'm not sure what the best way is to have Bazaar deal with a merge
that's not recorded properly - you might want to ask on this about the
Bazaar list.

Cheers,

Jelmer

Can you help with this problem?

Provide an answer of your own, or ask Eric Berry for more information if necessary.

To post a message you must log in.