<div>Hello,</div>
<div>as I already said in other messages I'm working on a sourceforge project. I checkout/update from cvs on a linux server, where I hg convert and then pull from a windows workstation.</div>
<div>During hg convert all the $Id gets converted.... an example:</div>
<div>$Id: draw.c,v 1.40 2008/02/05 18:40:36 giuseppem Exp $</div>
<div>becomes</div>
<div>$Id$<br></div>
<div>I'm now ready to commit, so from windows I checked-out the sourceforge repository, and I got problems....my idea was to use kdiff3 on the directory tree and use this tool to merge the different files (5 files)</div>
<div> </div>
<div>But now ALL files are different !!!!</div>
<div> </div>
<div>Probably my workflow is wrong.... any idea ???</div>
<div> </div>
<div>Thanks,</div>
<div>Francesco</div>
<div> </div>
<div>PS: just before hitting the send button I realize that since I use MQ, I may directly patch the MQ patch on the checked-out directory.... this should work...</div>