Yes, you can do this using mercurial without any extensions by Concatenating Changesets. Alternately if you want to use an extension you could use: The Collapse Extension The Rebase Extension or The Histedit Extension
When “waiting for lock on repository”, delete the repository file: .hg/wlock (or it may be in .hg/store/lock) When deleting the lock file, you must make sure nothing else is accessing the repository. (If the lock is a string of zeros or blank, this is almost certainly true).
The answer from Michael is a fine one, but another option is to just exclude: foo/bar/** and then manually add the .jar files. You can always add files that are excluded by an ignore rule and it overrides the ignore. You just have to remember to add any jars you create in the future.
Git doesn’t track renames at all, but uses heuristic to re-discover them during merge etc. Mercurial tracks renames (the origin version and origin file is recorded) and uses that information during merges. So you have to explicitly tell hg about renames with hg mv, or use hg addremove –similarity for auto-discovery. There has been some … Read more
To simply create a diff patch in git’s diff format from two arbitrary files or directories, without any fancy repository stuff or version control: git diff –no-index some/path other/path > some_filename Jakub Narębski’s comment on knittl’s answer hinted at the answer… For simplicity’s sake, that’s the full command. The > part creates a file and … Read more
The Git-HG rosetta stone is not bad There are a few other gotchas between the two not mentioned there. This list was cribbed from my own blog post when I went the other way (git -> hg). Hg .hgignore, syntax: glob is the same behaviour as git’s .gitignore. Git .git/config, ~/.gitconfig, use git-config to modify … Read more
You can even add multiple entries in the [paths] section of your .hg/hgrc file. [paths] default = /repo_store/hg/project1 sandbox = /repo_store/hg/project1_experimental And then can specify its alias in the mercurial commands. default repo need not be specified but others have to be like, hg in # check incoming changes from default repo hg in default … Read more
One way would be hg rollback (deprecated as of Hg2.7, August 2013) Please use hg commit –amend instead of rollback to correct mistakes in the last commit. Roll back the last transaction in a repository. When committing or merging, Mercurial adds the changeset entry last. Mercurial keeps a transaction log of the name of each … Read more
Navigate into your project and start git-daemon with the following switches: cd project git daemon –reuseaddr –base-path=. –export-all –verbose This tells git-daemon to serve up all projects inside the current directory (which I assume is the project directory containing the .git/ folder). It also tells it to re-use the same address if you shut it … Read more
MercurialEclipse Update site: https://bitbucket.org/mercurialeclipse/update-site/raw/default/ Installation manual As stated below (in comments) the name is MercurialEclipse. The name HgEclipse was a fork that Intland did and was later “merged” back again with MercurialEclipse, which moved around a bit between the current site, Google code and javaforge.com.