Skip to content
Felix S. Klock II edited this page Jul 28, 2013 · 1 revision

Most of Larceny development in the past couple of years has been kept on the [source:trunk trunk] of the source tree. Branches have been used for experiments, but if an experimental change proves worthwhile, then it is (supposed to be) merged in the trunk.

However, things did not always work this way.

This page is meant to provide a map of how development proceeded over time, because it is not always clear where code originated from looking at the head of the Subversion repository.
(In particular, Felix is a big fan of reading revision logs via Trac, but tracing back through the revision log breaks down when one hits the [source:trunk#2543 great replacement]. If someone is feeling ambitious, it would be nice to change the SVN log entry for changeset:2543 to explicitly link to the [source:branches/dotnet#2541 dotnet] and [source:branches/release_2#2500 release_2] branches, or better still, figure out how to muck with the repository so that it sees the files as copied from the appropriate sources.)

  • 07/2005 The [source:trunk#2543 great replacement] was Felix's attempt to make things sane.

    • It was a manual merge of the [source:branches/dotnet#2541 dotnet] and [source:branches/release_2#2500 release_2] branches into the trunk of the repository, where the first step was to delete everything on the trunk (changeset:2542).
  • 05/2004 The [source:branches/dotnet dotnet] branch was created off of the [source:trunk#1635 trunk] and the [source:branches/release_2#1826 release_2] branch.

    • Changes made (mostly by LTH) on the release_2 branch were periodically merged (mostly by JRM) into the dotnet branch, but this was done on an ad-hoc basis.
  • 11/2002 The [source:branches/release_2 release_2] branch was created off of the [source:trunk#1642 trunk].

Clone this wiki locally