Win32Extension

Francisco Diaz Trepat - gmail francisco.diaztrepat at gmail.com
Wed Jun 18 09:37:12 CDT 2008


Hi I wanted to verify with some one the use of
Win32Extension<http://www.selenic.com/mercurial/wiki/index.cgi/Win32Extension>

I have added the configuration, I'll include all in case some other
configuration could be canceling this one.

$ hg showconfig
bundle.mainreporoot=e:\WicketDemo
convert.cvsps=cvsps -A -u -Z 9
extensions.hgext.convert=
*extensions.hgext.win32text=*
merge-tools.diffmerge.args=--nosplash --merge --title1=base --title2=local
--title3=other $base $local $other
merge-tools.diffmerge.checkchanged=True
merge-tools.diffmerge.gui=True
merge-tools.ecmerge.args=$base $local $other --mode=merge3 --title0=base
--title1=local --title2=other --to=$output
merge-tools.ecmerge.gui=True
merge-tools.ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
merge-tools.filemerge.args=-left $other -right $local -ancestor $base -merge
$output
merge-tools.filemerge.gui=True
merge-tools.gpyfm.gui=True
merge-tools.gvimdiff.args=--nofork -d -g -O $local $other $base
merge-tools.gvimdiff.priority=-9
merge-tools.gvimdiff.regkey=Software\Vim\GVim
merge-tools.gvimdiff.regname=path
merge-tools.kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local
$other -o $output
merge-tools.kdiff3.fixeol=True
merge-tools.kdiff3.gui=True
merge-tools.kdiff3.regappend=\kdiff3.exe
merge-tools.kdiff3.regkey=Software\KDiff3
merge-tools.meld.gui=True
merge-tools.merge.checkconflicts=True
merge-tools.merge.priority=-10
merge-tools.p4merge.args=$base $local $other $output
merge-tools.p4merge.gui=True
merge-tools.p4merge.priority=-8
merge-tools.p4merge.regappend=\p4merge.exe
merge-tools.p4merge.regkey=Software\Perforce\Environment
merge-tools.p4merge.regname=P4INSTROOT
merge-tools.tkdiff.args=$local $other -a $base -o $output
merge-tools.tkdiff.gui=True
merge-tools.tkdiff.priority=-8
merge-tools.tortoisemerge.args=/base: $output /mine:$local /theirs:$other
/merged:$output
merge-tools.tortoisemerge.gui=True
merge-tools.tortoisemerge.regkey=Software\TortoiseSVN
merge-tools.xxdiff.args=--show-merged-pane --exit-with-merge-status --title1
local --title2 base --title3 other --merged-filename $output --merge $local
$base $other
merge-tools.xxdiff.gui=True
merge-tools.xxdiff.priority=-8
paths.default=ssh://mercurial@192.168.134.141/WicketDemo
ui.editor=notepad
ui.username=fdt (francisco.diaz.trepat at logismata.ch)

Here is the Scenario:

On an Ubuntu Hardy (best accessible O.S. :-) ) I did a *cvs checkout* and
then a *hg convert*.

Then from a windows xp machine running cygwin I did* $ hg clone ssh://
mercurial at 192.168.134.141/WicketDemo*

When I open some file with an ugly notepad I see the [] [] chars instead of
the correct line ending.

f(t)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20080618/cd59f047/attachment.htm 


More information about the Mercurial mailing list