Review of a new extension (hg remap) that I am working on

[Didly Bom]

On Mon, Jun 14, 2010 at 11:19 PM, Bill Barry <after.fallout at gmail.com>wrote:
>
> One feature that this could have which would make it a bit more useful than
> a dumb script would be if it could version the source file and have it
> automatically merge changes with the target file.
>

Bill, thanks for your feedback.

The idea of the extension is to map source controlled files into non source
controlled "target" files. So yes, the "source" files would definitely
_need_ to be version controlled.

When you say that changes (to the source files) should be automatically
merged to the target file, do you mean that you'd like to be able to make
the extension not simply overwrite an existing target file (as with the
proposed --force mode), but to also be able to merge into the target file
any new changes made to the source file?

If that is what you mean, I imagine that it should be possible using
mercurial's merge mechanism, although I wonder if the fact that the target
file would have no known parent would be a problem?


> Outside of this, I am not sure I see a benefit over a build script (and
> even with this, doing a merge from a script isn't that difficult, this would
> have the advantage of being easier and less error prone and would use the
> user's preferred merge tool instead of the build script writer's).
>

That is definitely my goal, to cover the most common cases and to make it as
automated and non error prone as possible, and to benefit from the power of
python which comes built into mercurial, rather than on an external
scripting engine or shell.

Thanks,

Angel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20100615/76f88a89/attachment.html>