.The joys of working in a locked down environment have made me painfully aware of whether things .require admin rights, since I don't have them :( I figure it's a fairly common situation.
The good and bad of Windows 7 is that this is now possible like never before. Don't feel too bad, our IT Dept. blocked access to Microsoft and MSDN, after purchasing us a subscription to MSDN. Go figure. .It will take me awhile to respond to the rest. As a point of reference, I'm most familiar with subversion, .and have used a bunch of version control systems over the years. I'm relatively new to distributed .version control systems. Take your time. It really will take me some time to get my arms around the thg documents. I've never used restructured text, so that'll be my personal learning curve. The changesets in mercurial have revisions that are unique. (They are numbered 1 through whatever in your workbench, but they actually have globally unique identifiers internally, so that they can perform synchs across distributed respositories.) In either case, a revision in a branch has a specific revision associated with it, and when you revert to a specific revision, you get that revisions copy of the file. It pretty much ignores in every way the fact that it's a branch. Likewise, when you do a merge, you start out with the tip of your local branch in the working directory. The branch you're merging with is used to compare source with the working directory's copy, where changes are put to create the merge. Then you do a commit with the working copy to make a new revision that is the merge. If you revert to a version that's in the branch, you get that version of the file. If you revert to the revision that is the merge, you get that copy of the file. The merges and branches are irrelevant. I wasn't really sure what you were asking about the implications to merges and branches. Because the question didn't really make a lot of sense (there are no implications -- merges and branches are just a DAG of revisions, and you're reverting to a specific revision, wherever it is or whatever it represents), I assumed you were new to VCS. This changes things. Sorry for being so dodgey, but if you were new to this, it might have allowed me to be more thorough in the explanation. Now that I know where you're coming from, I can be more direct. ------------------------------------------------------------------------------ Got visibility? Most devs has no idea what their production app looks like. Find out how fast your code is with AppDynamics Lite. http://ad.doubleclick.net/clk;262219671;13503038;y? http://info.appdynamics.com/FreeJavaPerformanceDownload.html _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
