Various about patches

hg user mercurialuser at gmail.com
Sun Dec 30 21:52:37 UTC 2007


I'm taking part on a sourceforge project. Till today I didn't have write
access to the repository and my workflow was:
from a linux box
- cvs update
- hg convert

from the development windows box
the first time: hg clone
following times hg pull

locally I work with MQ queues. I pull the MQ queue to the linux repository,
so the "main" repos is incoming only and the MQ patches is outgoing only.

I produced some patches (on the windows box) and when I tried to use them
myself on the linux box I had errors... of course I tried to patch on a
freshly checked out cvs repository ! patch was not able to use 2 out of 3
patches !

so I ask:

1) where can I find a "patch" program for windows ? kdiff3 can use patch
files ? hg import is not good, I need apatch program indipendent to hg.

2) how can I check if I mistakenly activated the -git option to the
diff/qdiff commands ? (it seems not to be the case)

3) can different linefeeds confuse the linux patch program ? I created the
patch in windows, cut and paste in a "vi" file and tried to patch.... the
cvs repos is for a windows program so it may have dos linefeeds while saving
the patch file I used the linux linefeeds....

4) following point 3, how can I check in an easy way what kind of linefeed
is present in a file ? In windows it's enough to open the file in
notepad...  in linux ... use od ?

Thank you,
Francesco
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20071230/678c8c24/attachment-0002.html>


More information about the Mercurial mailing list