Bazaar

how to undo 'bzr mv' before commit?

Asked by ToniMueller

When merging in changes from other branches, I often get bogus "renamed: x => x.moved" entries which are imho completely unwarranted. A diff of x and x.moved show that the files are identical. I'd like to weed out such bogus renames before I commit, but have not yet found a way how to do this. Alternatively, I'd like to see an explanation why these renames *are* warranted and/or mandatory.

Thank you!

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Marius Kruger (amanica) said : 		#1

2009/4/22 ToniMueller <email address hidden>:
> When merging in changes from other branches, I often get bogus "renamed: x => x.moved" entries which are imho completely unwarranted. A diff of x and x.moved show that the files are identical. I'd like to weed out such bogus renames before I commit, but have not yet found a way how to do this. Alternatively, I'd like to see an explanation why these renames *are* warranted and/or mandatory.

see the following related bugs:

https://bugs.launchpad.net/bzr/+bug/143977
Automatic methods to resolve .moved directories

https://bugs.launchpad.net/bzr/+bug/34956
Merging 2 branches which create the same directory causes confusion

Can you help with this problem?

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

To post a message you must log in.