If you’ve not yet commited, and it sounds like you haven’t you can undo all the merge work with hg update –clean. However, in newer mercurial’s there’s a handy command to re-merge a single file: hg resolve path/to/file.ext. From the hg help resolve: The available actions are: … 4) discard your current attempt(s) at resolving … Read more
hg update -C <one of the two merge changesets>
I don’t think you can do it just by setting a flag on git, but you can modify a config file that will allow you to push to multiple remote repositories without manually typing them all in (well only typing them in the first time and not after) In the .git/config file you can add … Read more
When the simplest way (a new hg clone) isn’t practical, I use hg strip: % hg outgoing -l 1 % hg strip $rev # replace $rev with the revision number from outgoing Repeat until hg outgoing stays quiet. Note that hg strip $rev obliterates $rev and all its descendants. Note that you may have to … Read more
When you update to D and graft F::J, Mercurial runs a number of merges. It will start with this merge: M = three_way_merge(local=D, other=F, base=E) If we write +d for the delta between the states C and D, then we start with: +d +e +f —- C —- D —- E —- F —- Turn … Read more
Looks like you have an open git commit or git merge going on, and an editor is still open editing the commit message. Two choices: Find the session and finish it (preferable). Delete the .swp file (if you’re sure the other git session has gone away). Clarification from comments: The session is the editing session. … Read more
Try git log –follow on your file. Is it possible to move/rename files in Git and maintain their history?
git push doesn’t push all of your local branches: how would it know which remote branches to push them to? It only pushes local branches which have been configured to push to a particular remote branch. On my version of Git (1.6.5.3), when I run git remote show origin it actually prints out which branches … Read more
Mr. Millikin, if you will take a few moments to review some of the documentation on fossil, I think your objections are addressed there. Storing a repository in an sQLite database is arguably safer than any other approach. See link text for some of the advantages of using a transactional database to store a repository. … Read more
The biggest difference is how the branch names are recorded in the history. With named branches the branch name is embedded in each changeset and will thus become an immutable part of the history. With clones there will be no permanent record of where a particular changeset came from. This means that clones are great … Read more