Bitbucket is a code hosting site with unlimited public and private repositories. We're also free for small teams!

SCM Correctness Read Me

Author: Ringo De Smet <ringo DOT desmet AT gmail DOT com>

A lot of incomplete information is found regarding what certain SCM systems can or can't
perform. Most of the discussions handle the merging of incompatible actions, taken by
distinct people in a team. While the actions themselves are usually easy to execute, 
the hardest part is getting these incompatible changes merged together into a single
(code) base.

The discussions I'm referring too are usually spread over different forums, blogs with
comments, etc. A good set of scripts that show the outcome of a specific rename and merge
scenario in different SCM systems can be found here:

The scripts automate a scenario described my Mark Shuttleworth

I took these scripts as the base line for extending these, but credit goes to who 
credit deserves: thanks Maciej Bliziński, and all the other contributors to the scripts.

In short, what was changed to these scripts from then on:

* Converted to use shUnit2 as testing framework.

This test suite is hosted on BitBucket, containing a Wiki and Issue Tracker.
Please file any issues and submit patches here:



Recent activity

Nothing to see here, move along.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.