On Friday 18 Dec 2009 10:48:39 am S.Ramaswamy wrote: > > BTW, the repo has multiple heads (hg heads). Nothing wrong with that - > > just > > wondering > how that would play out in a merge scenario with multiple repos. >
probably hell - I am on mercurial after 5 years of svn, and still have a tendency to do things the svn way. Anyway I played with 4 repos and now have figured it out: 1. hg pull 2. hg merge if conflict: 3. edit file 4. hg merge -m filename 5. hg commit and done. This works with 4 toy repos with 2 files - let us see if works on a production server with many files and pressure. -- regards kg http://lawgon.livejournal.com _______________________________________________ ILUGC Mailing List: http://www.ae.iitm.ac.in/mailman/listinfo/ilugc
