Mercurial > hg
view tests/test-issue322.t @ 13624:78cc35e75ecc stable
eol: do not abort when win32text is found, only warn
The win32text extension does not break eol or vice-versa, so it is not a fatal
error to have both of them enabled. It's just folly. So spewing warnings in
this condition is preferrable to aborting. When both extensions are enabled,
the user now sees:
% hg st
the eol extension is incompatible with the win32text extension
win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
M hgext/eol.py
author | Steve Borho <steve@borho.org> |
---|---|
date | Sun, 13 Mar 2011 10:03:06 -0500 |
parents | b63f6422d2a7 |
children |
line wrap: on
line source
http://mercurial.selenic.com/bts/issue322 File replaced with directory: $ hg init a $ cd a $ echo a > a $ hg commit -Ama adding a $ rm a $ mkdir a $ echo a > a/a Should fail - would corrupt dirstate: $ hg add a/a abort: file 'a' in dirstate clashes with 'a/a' [255] $ cd .. Directory replaced with file: $ hg init c $ cd c $ mkdir a $ echo a > a/a $ hg commit -Ama adding a/a $ rm -r a $ echo a > a Should fail - would corrupt dirstate: $ hg add a abort: directory 'a' already in dirstate [255] $ cd .. Directory replaced with file: $ hg init d $ cd d $ mkdir b $ mkdir b/c $ echo a > b/c/d $ hg commit -Ama adding b/c/d $ rm -r b $ echo a > b Should fail - would corrupt dirstate: $ hg add b abort: directory 'b' already in dirstate [255]