How should I proceed to resolve conflict with no cvs-like eclipse 'synchronise perspective' ?

Asked by Manson Thomas


  In CVS, there is a synchronize perspective that shows the in/out/conflict change.

  And when you double click on a file, you have a 2-way diff view to help to solve the conflict by editing the local file (and then mark as merged)

  I didn't see a similar tool with BzrEclipse.

  How should I proceed ?


Question information

English Edit question
Bazaar Plugin for Eclipse Edit question
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Javier Derderyan (javierder) said :


Right now there isn't a similar tool in BzrEclipse, but it's in our roadmpap [ ] and will be soon!

Revision history for this message
Guillermo Gonzalez (verterok) said :

Thanks for the reply Javier,
Manson, In the meantime, you can use the one builtin with eclipse (I think eclipse >= 3.3) by selecting the .BASE, .THIS and .OTHER files and doing right click --> compare with..

Revision history for this message
Brian Rittermann (britterm) said :

Where are these files .BASE, .THIS, and .OTHER ?

Also, I haven't seen many updates in the past few years on the plugin. Do you have an ETA on version 1.4? When is "soon" ?

Can you help with this problem?

Provide an answer of your own, or ask Manson Thomas for more information if necessary.

To post a message you must log in.