Using Mercurial Hg to Pull and Commit

On my latest project I need to use Mercurial Hg as source control tool.
I'm on windows so I use Tortoise Hg (who also prvide svn and cvs ui tools)

One big difference thus far is committing to and updating from the repo is a 2 step process for Mercurial.

When getting changes from the central repo, you must Pull the changes (changeset) but then also merge and commit then to your local (just pulling is not enough). You must commit your own local changes first before you can commit the pulled changes. Tortoise hg synch menu has an option to just pull all or view a list of pulls and decide what to accept.
From the docs:

  1. Pull changes from the group repository into your repository, TortoiseHg ‣ Repository Browser or hgtk log, choose the path to the group repository in the syncbar and then Pull.
  2. If some changesets were pulled, merge those changes with your local changes and then commit the merge into your local repository. From the changelog viewer (TortoiseHg ‣ Repository Browser or hgtk log) open the context menu over the changeset which you want to merge and select merge with. Finally, in the merge dialog, press Merge and then Commit.

You commit and can then Push at a later time. Push will push all commits to date.
From the docs

When you’re ready to publish your changes, you
  1. Commit your changes to your local repository (see above).
  2. Pull changes from the group repository into your repository, TortoiseHg ‣ Repository Browser or hgtk log, choose the path to the group repository in the syncbar and then Pull.
  3. If some changesets were pulled, merge those changes with your local changes and then commit the merge into your local repository. From the changelog viewer (TortoiseHg ‣ Repository Browser or hgtk log) open the context menu over the changeset which you want to merge and select merge with. Finally, in the merge dialog, press Merge and then Commit.
  4. Ensure your merged work still builds and passes your extensive test suite.
  5. Push your changes to the group repository, TortoiseHg ‣ Repository Browser or hgtk log, choose the path to group repository and then Push.

Comments

Post a Comment

Popular posts from this blog

deep dive into Material UI TextField built by mui

Image
The Material Design system is a design system used to create consistent digital experiences across platforms such as android, web and ios. Includes: a color system a typography system a shape system a grid system it addresses motion and lots more Also includes Material Theming which makes it easy to customize Material Design to match your brand. Material Design is not just a set of guidelines it is a whole ecosystem. Material itself stopped maintaining it's react implementation and recommends opensource versions.  A very popular open source implementation is  MUI ,  a react component library  built to implement Material Design . Bills itself as the "worlds most popular React UI framework" and at this time has 1.2M weekly downloads on npm and used by over 750k projects on github (did I mention it's very popular?).  Note: there are other react component libraries implementing bootstrap and ant design for example, so up to you and your design team on what you choose. 
Read more

angular js protractor e2e cheatsheet

Many from the protractor test suite category detailed task syntax example load page load a page browser.get('yoururl') browser btn actions browser back/forward browser.navigate().back() OR browser.navigate().forward() access elements on page See Protractor API list and examples from Protractors test suite access by angular ngmodel name (must match ngmodel in the html) this is the preferred approach element(by.model('person.name')); access by the css id on the page e.g, #user_name (but this can be brittle) element(by.id('user_name')) access angular binding to get generated value i.e. for {{}} element(by.binding('person.concatName')); access angular repeat list data (must match repeat stmt in the html) See Protractor test suit l
Read more

react-router v6.4+ loaders, actions, forms and more

react-router  react-router is used for in app single page app navigation, we configure routes for pages in the app to map to components react-router has over 1bn downloads, its an industry standard (but there are others e.g. Nextjs router) many apps use react-router, many on v5.x the new react-router 6.4.x the newest major version of react router v6.4 is a significant enhancement which adds a lot of new features. react-router v6.4 offers new features to load data (loaders) and handle actions (actions).  It's done gone all Remix-y which makes sense because the same guys wrote both. eliminates a lot of boilerplate code to fetch data in useEffect() and set various loading states put your data load and update logic in react-route components instead of custom code unlike Remix, react-router v6.4 is still just all on the client (not server like Remix) paradigm shifts Lets start with a couple of high level ideas; "back to the future" so to speak OR "what's old is new ag
Read more