Contents conflict from fast-import when files were renamed

[Eric Siegerman]

On Sat, 2011-03-26 at 12:33 +0200, Eli Zaretskii wrote:
> Also, shouldn't
> the fast-import plugin provide a way of generating bzr renames while
> importing from git repositories in such cases, in the first place?

ISTM that if git isn't going to provide any hints about renames,
fast-import would have to heuristically deduce them.  Never mind
that the "mv --auto" logic is flawed, as we were discussing
recently; even the better logic from the "automv" plugin is
imperfect, as an heuristic must be.  The problem, AIUI, is that
fast-import creates Bazaar revisions directly; thus, you don't
get a chance to clean up the heuristic's inevitable wrong guesses
before committing, as you do with an explict "mv --auto" or
"automv" in your working tree.

One could presumably write a filter for fast-import-format
streams that attempted to detect renames and modify the stream
accordingly -- but then, the filter would need to provide for
manual intervention, else there'd be no improvement over putting
the rename-detection heuristics directly into fast-import.

Does bzr-git deal with the rename problem?  If it does, using
that instead of fast-import might be a way forward.

  - Eric