EOL extension

Mark Hammond skippy.hammond at gmail.com
Wed Dec 2 18:59:21 CST 2009


I made a first pass at trying to use the eol extension for real.  I 
started with a fresh clone of an existing repository.  After adding and 
committing my .hgeol file, I wondered how to convert the working tree to 
the new format - and figured I could do "hg up -r 0" followed by "hg 
up".  It has since been pointed out I probably wanted '-r null', and 
although I don't get the same problem with '-r null' this problem seems 
worth reporting anyway.

So starting with the fresh clone:

% hg up -r 0
15 files updated, 0 files merged, 1926 files removed, 0 files unresolved

% hg up
1927 files updated, 0 files merged, 14 files removed, 0 files unresolved

[[ All good.  For testing, I created a .hgeol file consisting of:
[patterns]
**=native
]]

% hg add .hgeol

% hg ci -m "add .hgeol"
.hgeol
committed changeset 1136:fda353c4fd1d

% hg up -r 0
15 files updated, 0 files merged, 1927 files removed, 0 files unresolved

% hg up
  local changed server/python/build/lib/junius/getmail.py which remote 
deleted
use (c)hanged version or (d)elete?

Note the and erroneous reporting of a local change which did not occur 
without the extension.

HTH,

Mark


More information about the Mercurial-devel mailing list