How to abort a merge in mercurial?
hg update -C <one of the two merge changesets>
version-control
How to find untracked files in a Perforce tree? (analogue of svn status)
EDIT: Please use p4 status now. There is no need for jumping through hoops anymore. See @ColonelPanic’s answer. In the Jan 2009 version of P4V, you can right-click on any folder in your workspace tree and click “reconcile offline work…” This will do a little processing then bring up a split-tree view of files that … Read more
Delete all local changesets and revert to tree
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
Consequences of using graft in Mercurial
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
Can you “ignore” a file in Perforce?
As of version 2012.1, Perforce supports the P4IGNORE environment variable. I updated my answer to this question about ignoring directories with an explanation of how it works. Then I noticed this answer, which is now superfluous I guess. Assuming you have a client named “CLIENT”, a directory named “foo” (located at your project root), and … Read more
Should commit messages be written in present or past tense? [closed]
I think of these messages as they appear to other developers. They don’t yet have the changes applied, and there is the implicit question, “what will applying this changeset/patch do?” It will “Fix the XXX bug in YYY”! For other verbs writing them as a command seems more natural, and works better if you have … Read more
When should you branch?
In general term, the main purpose of branching (a VCS – Version Control System – feature) is to achieve code isolation. You have at least one branch, which can be enough for sequential development, and is used for many tasks being recording (committed) on that same unique branch. But that model shows quickly its limit: … Read more
Command to clear the Git Bash screen, including output buffer
Actually you are looking for a Unix user environment command clear or you can use the keyboard shortcut ctrl+l http://en.wikipedia.org/wiki/Clear_(Unix) To clear entire command history in Git Bash. history -c
Should the .gradle folder be added to version control?
Should I track the .gradle directory? No. It can safely be ignored. Why should I ignore it? It’s purely for caching information, you don’t want it in your repo because: it can get big and be full of binary files there can be machine specific data in there there’s a lot of churn in there … Read more
git add . vs git commit -a
[*] git commit -a means almost[*] the same thing as git add -u && git commit. It’s not the same as git add . as this would add untracked files that aren’t being ignored, git add -u only stages changes (including deletions) to already tracked files. [*] There’s a subtle difference if you’re not at … Read more