The NetBeans knowledge base article on project files & version control discusses the NetBeans project files, with loose advice about which files are project specific (i.e. can be shared via version control), and which are user specific. Here is the section on version control: If the project is checked out of a version control system, … Read more
There may be others with different experiences, but in mine checking in half-finished code is a horrible idea, period. Here are the principles I have learned and try to follow: Check in often – at least once, but preferably many times per day Only check in complete functionality If the first and second conflict (e.g. … Read more
Mercurial 3.5 has progress enabled by default. Earlier versions can use the standard progress extension shipped since version 1.5. Simply enable the extension by adding this to your hgrc file: [extensions] progress = You will then see progress bars on clone, push, pull, and other operations. The progress bars are only shown after an initial … Read more
Merges from Dev* -> Integration and Integration -> Production should always be “copy” merges. This is the safest way to preserve the stability of your downstream branches. First merge in the other direction (e.g. Integration -> Dev2) to pick up the latest changes from the target branch. If there are conflicts, handle the diffs on … Read more
I would rather go with the clearfsimport script, better equipped to import multiple times the same set of files, and automatically: add new files, make new version of existing files previously imported (but modified in the source set of files re-imported) remove files already imported but no longer present in the source set of files. … Read more
I like your idea of putting the Sandcastle files as a peer to Source and Tests, I would add a documentation folder, that would then contain the sandcastle files, and optionally the actual documentation. There are definetly differences of opinions and I’m sure I will be downvoted for this (since I have been before). I … Read more
These are some thoughts I’ve had on this matter of subject. In the end you may need to keep assets and code as separate as possible. I can think of several possible strategies: Distributed, Two Repositories Assets in one repo and code in the other. Advantages In web development context you won’t need to clone … Read more
Examine the first screen shot and see that the top line says 8+ in the Rev column. This means that your working copy is based off revision 8. You can follow the line down and also see that it joins at revision 8 which indicates the same thing. There are two ways to solve this … Read more
It is correct that you cannot easily remove a particular file from Mercurial in the sense that doing so will disrupt all the changeset IDs in your repository. When you change the changeset IDs, everybody has to re-clone the repository. See the Wiki page about editing history for information about the consequences of modifying the … Read more