undoing a merge

[James Westby]

On (24/06/07 13:57), Adam Mercer wrote:
> Hi
> 
> I accidentally ran a full merge between two of my branches when I
> meant to only cherry pick a single revision 
[snip]
> is there a way that I can revert all the changes made by this merge?
> I've tried reverting the changes to the individual changed files, but
> I still get the following when checking the status:
> 
> $ bzr status
> pending merges:
>  Adam Mercer 2007-06-24 clean up header
>    Adam Mercer 2007-06-23 add inspmdc.c
>    Adam Mercer 2007-06-23 add xml2mdc.c
> 
> how can I cancel this merge and get my tree back to the state it was
> before the merge?
> 

A simple

  $ bzr revert

with no paths will remove the pending merges.

Thanks,

James

-- 
  James Westby   --    GPG Key ID: B577FE13    --     http://jameswestby.net/
  seccure key - (3+)k7|M*edCX/.A:n*N!>|&7U.L#9E)Tu)T0>AM - secp256r1/nistp256