how does one resolve conflicts in mercurial? In subversion one just edits
> the
> file and then do svn resolve filename and it is resolved. This does not
> seem to
> work in mercurial - and I find the docs unclear also. I notice two files on
> a
> resolve - one is marked .orig. Whatever I do the hg reports merge failure.
> Any
> tips?
>
>
You probably already know this.The conflict resolution procedure in
mercurial:
1. hg pull
2. hg update ( steps 1 & 2 can be combined with hg pull -u )
3. hg merge (if step 2 fails)
4. Find out files with conflicts with 'hg status'
5. Sort out conflict either with GUI merge tool or by physically removing
conflict markers etc (depending on your merge tool configuration)
6. hg resolve -m "***"
7. hg ci -m "***"
8. hg push (etc)
Is this a repo that's publicly available for cloning ?
Try updating to the latest version of mercurial if all else fails. The older
repo formats are compatible.
Ramaswamy
_______________________________________________
ILUGC Mailing List:
http://www.ae.iitm.ac.in/mailman/listinfo/ilugc
