Unable to kick off a merge
Bug #294061 reported by
Eric
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar Plugin for Eclipse |
Fix Released
|
High
|
Guillermo Gonzalez | ||
Java library for Bazaar |
Fix Released
|
High
|
Guillermo Gonzalez |
Bug Description
I created a test repository (A) with a couple of files in it then created a branch (B) from it using the Eclipse plugin Team -> Branch command. If I modify a file in B and commit it then I am able to call Team -> Merge on A to get the modification into A. However if I modify a file in A and commit it then when I call Team -> Merge on B I don't even get the "Remote location Dialog" box and nothing happens ! I am able to do the merge using the "bzr merge" command from the command line. Is this a bug or is there something I am doing incorrectly ?
I am working with Eclipse Gannymede 3.4.1 (for C/C++), Bazaar 1.7rc2 and version 1.1.1 of the bzr-eclipse plugin.
Changed in bzr-java-lib: | |
status: | Confirmed → Fix Committed |
Changed in bzr-eclipse: | |
assignee: | nobody → verterok |
status: | Confirmed → Fix Committed |
Changed in bzr-eclipse: | |
status: | Fix Committed → Fix Released |
Changed in bzr-java-lib: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
I have attached a zip file containing the Eclipse workspace which contains the 2 branches