Tag: mercurial

Using Git or Mercurial, how would you know when you do a clone or a pull, no one is checking in files (pushing it)?

Using Git or Mercurial, how would you know when you do a clone or a pull, no one is checking in files (pushing it)? It can be important that: 1) You never know it is in an inconsistent state, so you try for 2 hours trying to debug the code when your code is in […]

Mercurial Bookmarks and 'Git like branching'

I am not having any luck using Bookmarks in Mercurial for Git like branching. From the article: https://www.mercurial-scm.org/wiki/BookmarksExtension, I’ve set “track.current” to true in my .hgrc file. Excerpt below: By default, when several bookmarks point to the same changeset, they will all move forward together. It is possible to obtain a more Git-like experience by […]

Strategies for multiplatform project repository design

I am looking for strategies regarding repository layout/design when dealing with multiplatform projects. Usually dependencies are: Project has single name/brand Each platform has separate source code Platform code shares common resources Design docs and other documentation is shared between platforms I’ve already tried (using git) following: Solution A: Each platform project resides in its own […]

Is there a mercurial equivalent to gits no-fast-forward merge?

What is the mercurial equivalent to gits no-fast-forward merge (in case a fast forward would be possible)? Edit Assume you have a branch/bookmark at your head/tip of master/default: o feature | o | o master/default | … A simple fast forward merge would result in: o feature/master/default | o | o | … A no-fast-forward […]

merge-base analog for Mercurial and bzr (to find common ancestors as possible for a merge)?

Git have merge-base command that show common ancestors of two or more branches. What analog for Mercurial and bzr?

Can TortoiseHg, TortoiseGit and Git Extensions Peacefully Coexist?

This is on a 64 bit Windows Machine, also running Visual Studio 2010. A similar question (re TortoiseSVN and TortoiseHg) was asked 3 years ago, but the software was several versions earlier and addressed TortoiseSVN rather than TortoiseGit. Please keep this in mind if tempted to close this thread. Will the 3 pieces of software […]

Python wrapper to access Hg, Git and possibly Bazaar repositories?

I’m looking for a Python library that can do basic manipulation of repositories, but is independent of the backend version control system. By basic manipulation, I’m referring to: initialize a repo, add files, commit, pull, push, get current revision number. Users of the library could do something this: import dvcs_wrapper as dvcs dvcs.set_backend(‘hg’) # could […]

Why Mercurial doesn't need “recursive merge strategy”?

AFAIK git‘s default merge strategy is “recursive” which means when more than one “common ancestor” ends up being a “good candidate”, git will merge them and create a new “virtual common ancestor” for the contributors. It basically helps solving situations where files were already merged and it avoids merging them again or coming up with […]

Multiple simultaneous version control systems?

I’m relatively new to version control, and so far only have experience working with Subversion using TortoiseSVN/VisualSVN. I’ve been reading about other types of VCS (git, mercurial, etc), and am considering trying them out – however, many of the arguments for or against a particular VCS seem like they largely come down to subjective preference, […]

dvcs partial merge (git, hg merge tracking)

I’ve one question about general DVCS, including Git and Hg. In both Git and Hg merge tracking is done at the “commit” level instead of the “file/directory” level. One of the “side effects” is that you can’t easily do a “partial merge”: You’ve modified 30 files in your branch “feature_branch_x” You want to merge ONLY […]

Git Baby is a git and github fan, let's start git clone.