Dan Guzman wrote, On 08/16/2010 06:30 PM: > Newbie here again. > > Perhaps what I need is a brief conceptual lesson on Source Control, with > Hg context. > > I have a source repo and 2 clones. > > When the source was made, the project had already started 2.0 > programming. The clones were made, and one of them continued 2.0 > programming. The second clone backed out the few 2.0 changes that had > been made, and made several 1.x patches for sending to the customer. I > pushed the changes from that clone back to the source. Now the 2.0 > clone would like to integrate the 1.x patches into 2.0. When I look at > the tortoise repository explorer, I see all the revisions made by the > other clone, but I clearly don't want them all, especially the > back-outs. When I look at my options for the pending pulls, it seems > that I can only 'Update' continuously to a certain point. I can't skip > revisions. What I want is just the changes in revisions 5 and 10,11,12 > and 25, but not the rest. > > Am I missing the point of Source Control? Should I have branched the > 2.0 development, so the heads of 1.x would be different than 2.0? How > is pulling different than merging? It seems the documentation is > specifically for 'this function does this task' (which it does well), > what I seem to need is why would I use that function, under what > circumstances would I use it, and such.
The documentation cal tell how Mercurial works, but it can't tell how you work ;-) First of all: Try to create a workflow where you don't use "backout" or cherry picking / transplant. Let the patches flow in one direction only. I think http://www.perforce.com/perforce/papers/bestpractices.html and http://www.youtube.com/watch?v=ouEHuTr4k6s says some good things about branches and policies - but also a lot things that doesn't apply to Mercurial. Mercurial don't support the bad habit of picking individual changes. If you have to do it anyway then you can use "hg export" and "hg import" - or the "transplant" extension. /Mads ------------------------------------------------------------------------------ This SF.net email is sponsored by Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
