EOL extension
Martin Geisler
mg at lazybytes.net
Thu Dec 3 06:21:36 CST 2009
Mark Hammond <skippy.hammond at gmail.com> writes:
> On 3/12/2009 10:25 PM, Martin Geisler wrote:
>> I believe your problem is that you also have files that appear modified
>> when you update to revision 0. These modifications are then to be merged
>> into the target revision after the the update (tip). And then things go
>> wrong because a file "you" modified has been deleted.
>
> Thanks for looking into this, and I'm happy to help find such issues
> before things get too set in concrete. I'm not sure where this leaves
> us though - unless I misunderstand you analysis, it appears I might be
> forced to choose between native line-endings and the ability to jump
> back through the revision history?
No, it's just not implemented yet. The extension always uses .hgeol from
tip and that is wrong.
--
Martin Geisler
VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
More information about the Mercurial-devel
mailing list