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
It’s been almost 2 years since I originally posed this question. I’d do it differently now (as I mentioned in a comment above the question above). What I’d do now would be to instead commit my changes to the one file in my local repo (you can use the hg record extension to only commit … Read more
Update: Mercurial has added –amend which should be the preferred option now. You can rollback the last commit (but only the last one) with hg rollback and then reapply it. Important: this permanently removes the latest commit (or pull). So if you’ve done a hg update that commit is no longer in your working directory … Read more
You could probably try this stuff out and learn it more quickly than writing up your question took, but I’ll bite. Can any or all of these steps be executed with TortoiseHG, as of version 0.9.2? If yes, how? TortiseHG doesn’t yet put GUI wrappers around sub-repo creation, but TortiseHG has always done a great … Read more
I’ve worked with Word documents in SVN. With TortoiseSVN, you can easily diff Word documents (between working copy and repository, or between two repository revisions). It’s really slick and definitely recommended. The other thing to do if you’re using Word documents in SVN is to add the svn:needs-lock property to the Word documents. This will … Read more
Here’s the cheat sheet on the commands: hg update changes your working copy parent revision and also changes the file content to match this new parent revision. This means that new commits will carry on from the revision you update to. hg revert changes the file content only and leaves the working copy parent revision … Read more