Unmerge?

[Martin Pool]

2009/5/1 Eric Berry <elberry at gmail.com>:
> Hi Martin, thanks for the quick response!
>
> I tried this:
> bzr merge -r 3..2 .
>
> This resulted in the changed files being marked as having conflicts.
>
> If I run a bzr status just before performing the merge it shows that I do
> not have any uncommitted changes.
>
> Is there a way to not have to resolve the conflicted files?

You should only encounter conflicts here if the changes you're trying
to reverse conflict with changes made after revision 3.  If you have
no other changes after 3, this is clearly a bug.  (But in that case
you can also more simply perhaps just uncommit and revert.)  If you
have changes but they shouldn't conflict, eg because they didn't touch
those files, that would also seem to be a bug.  If there are essential
changes then yes you do need to resolve them.

The bug might be specific to bzr-svn.

Can you describe more about just what the conflicts are?

-- 
Martin <http://launchpad.net/~mbp/>