Comment 4 for bug 217737

Unfortunately I'm using bazaar to manage my workflow at work and the software that I'm developing is not open etc.

I can give the metadata that bzr generates etc... will a bzr check on the parent branch (src) and a check on the child branch (src-plumbing) be enough info? (the log file of that is)

Can reiterate my steps:
1 made a change to a single file in (src)
2 did a commit in (src)

3 did a bzr merge in (src-plumbing)
4 got conflicts
5 I changed the file and did a commit
6 I found that my .project file was also different and i manually (outside bzr) deleted the .project.base and .project.other files
7 It then complained about pending deletes and i removed that folder under the .bzr dir ... it had one file in, that contained the .project file's text.
8 But i managed to get my status showing that only a merge was pending

and this is the situation it is in now ..

If that delete I did was dodgy then it should show that in my status or check commands that something isn't right etc.

Is there a way to clean it or is there an workaround so i can continue merging etc? May a way to reset the referenced revision id etc?