I've got a few questions I'm hoping someone can help me out with. I think the questions can be answered w/o having to read through my scenario, but I thought it might be useful for context.
Scenario: We use Clearcase at work. Because it doesn't even support changesets and is frequently a pain to work with, and I was also interested in learning how mercurial works, I decided to use mercurial for the feature I'm currently working on. I've got TortoiseHg 0.9.2 installed on my Windows XP box (actually 2 of them). In order to use mercurial I have a couple of Clearcase views (of our codebase). One of them is on top of a hg repository. I use this one to periodically update the hg repository default branch with the latest changes in the Clearcase repository so that they match. The other Clearcase view I use for checking changes back into Clearcase. I might be able to use the 1st Clearcase view (the one w/ the hg repository under it) for this purpose, but there were a couple of issues before, so for now I don't want to confuse the issue. The major problem is that Clearcase requires that all files it is tracking be readonly unless the file has been checked out of Clearcase. If the file is not readonly and has not been checked out of Clearcase, it is considered "renegade". I've been doing my development in a clone of the hg repository that is under the Clearcase view lets call it 'Main', in a named branch I'll call 'Dev'. Every so often I pull the latest Clearcase changes from 'Main' to 'Dev', and then merge the default branch to my feature branch in 'Dev'. Now I'm ready to get my changes back into Clearcase. To do this I will need to: 1. Check out every changed file from Clearcase. 2. Then patch each of those files with my changes 3. Then check them all back in. Question 1: Can I create a patch from the tip of my feature branch to the tip of the default branch? I see the 'export patch' in the context menu in the Repository Explorer in THG. It seems if I want to use that I'd have to do the merge first in mercurial, and then use that option to create the patch? Question 2: How would I get a file containing a list of all the files that are patched by the patch I just created? Question 3: How do I apply the patch to the Clearcase view? I haven't ever used a patch file before and I'm not sure what patch tool to use or if the patch created by THG needs to be applied starting from a particular location and/or using special options. I'm probably going to get my changes checked into Clearcase on Monday, and I can do this all manually, but I thought there might be an easier way, and it was worth asking. Thanks, Mike
------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________ Tortoisehg-discuss mailing list Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
