Anytime I complete a “full thought” of code that compiles and runs I check-in. This usually ends up being anywhere between 15-60 minutes. Sometimes it could be longer, but I always try to checkin if I have a lot of code changes that I wouldn’t want to rewrite in case of failure. I also usually … Read more
‘hg forget‘ is just shorthand for ‘hg remove -Af‘. From the ‘hg remove‘ help: …and -Af can be used to remove files from the next revision without deleting them from the working directory. Bottom line: ‘remove‘ deletes the file from your working copy on disk (unless you uses -Af) and ‘forget‘ doesn’t.
WARNING: a “dummy merge”, as is recommended by @Martin_Geisler, can really mess you up, if later you want to do a true merge of the two branches. The dummy merge will be recorded, and say that you merge into the branch you did the dummy merge to — you will not see the changes. Or … Read more
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
From my answer to a different question: Distributed version control systems (DVCSs) solve different problems than Centralized VCSs. Comparing them is like comparing hammers and screwdrivers. Centralized VCS systems are designed with the intent that there is One True Source that is Blessed, and therefore Good. All developers work (checkout) from that source, and then … Read more
Here is the method I’ve used in the past with good success: /trunk – bleeding edge. Next major release of the code. May or may not work at any given time. /branches/1.0, 1.1, etc. Stable maintenance branches of the code. Used to fix bugs, stabilize new releases. If a maintenance branch, it should compile (if … Read more
Most helpful Answer There is a plugin called SCM Sync configuration plugin. Original Answer Have a look at my answer to a similar question. The basic idea is to use the filesystem-scm-plugin to detect changes to the xml-files. Your second part would be committing the changes to SVN. EDIT: If you find a way to … Read more
The difference is in the publication process: a CVCS (Centralized) means: to see the work of your colleague, you must wait for them to publish (commit) to the central repository. Then you can update your workspace. You are an active producer: if you don’t publish anything, nobody sees anything. You are a passive consumer: you … Read more
Beware: ClearCase is File-centric, not repository centric (like SVN or CVS). That means it is rarely a good solution to checkout all files (and it can be fairly long with ClearCase 😉 ) That being said, the question is perfectly legitimate and I would like to point out another way: open a cleartool session in … Read more
Using a file template is definitely the best solution. For example, if you have a database.ini file, commit a database.ini.template file and ignore database.ini in .hgignore