Automatic methods to resolve .moved directories

[Yuri Baburov]

Currently there's no easy method to resolve .moved directories created by bzr merge.
What do you suggest user to do, if she create the same directory with the same or similar files in two diverged branches, commit it and will try to merge branches?
The best solution I can think of is the command "resolve --merge <directory>".

(How to reproduce - https://bugs.launchpad.net/bugs/34956)

[Yuri Baburov (buriy)]

And this command could work with moved files also!

[Aaron Bentley (abentley)]

Please see "bzr help conflicts". Resolving a filename conflict requires human intelligence. If it did not, it would not be emitted as a conflict.

[Aaron Bentley (abentley)]

Sorry, the documentation is in the user guide: http://doc.bazaar-vcs.org/bzr.0.91/en/user-guide/conflicts.html

[Yuri Baburov (buriy)]

>Please see "bzr help conflicts". Resolving a filename conflict requires human intelligence.
Sorry, but so what? :)
Sometimes this intelligence is to merge old .moved directory with newly created.
Join all files inside, as they are in fact different versions of the same folder.
Intelligence is only to say that directories are actually the same directory.
"If you wish, you can rename either one of these files, or combine their contents. " (from docs)
How do I combine their contents?
I would like to be able to transform path conflict to content conflict(s).
Or else I will have to use command line diff for them instead of my editor features and 3-way diff!

p.s. Maybe amend bug title a bit? Seems current one confused you.

[Martin Pool (mbp)]

I don't think this can be totally automatic, otherwise we wouldn't have conflicted in the first place, but we could certainly have commands to help resolve conflicts.