diff options
| author | Owen Jacobson <owen.jacobson@grimoire.ca> | 2013-01-03 20:06:18 -0500 |
|---|---|---|
| committer | Owen Jacobson <owen.jacobson@grimoire.ca> | 2013-01-03 20:55:30 -0500 |
| commit | 074759948e4a015d90278966b50e2b216abfc4f0 (patch) | |
| tree | 5c82a96fe5b8d1999578197775c3f5cc4806c29c /wiki | |
| parent | b4e1d897d127263507f21ece87b4e95d8103d56a (diff) | |
"Recently" in 2008. It's 2013 now.
Diffstat (limited to 'wiki')
| -rw-r--r-- | wiki/dev/merging-structural-changes.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiki/dev/merging-structural-changes.md b/wiki/dev/merging-structural-changes.md index 46f8766..e1a7c1e 100644 --- a/wiki/dev/merging-structural-changes.md +++ b/wiki/dev/merging-structural-changes.md @@ -1,11 +1,11 @@ # Merging Structural Changes -Recently, a project I'm working on set out to reinvent their build process, +In 2008, a project I was working on set out to reinvent their build process, migrating from a mass of poorly-written Ant scripts to Maven and reorganizing -their source tree in the process. The development process is based on having a -branch per client, so there is a lot of ongoing development on the original -layout for clients that haven't been migrated yet. We discovered that our -version control tool, [Subversion](http://subversion.tigris.org/), is unable +their source tree in the process. The development process was based on having +a branch per client, so there was a lot of ongoing development on the original +layout for clients that hadn't been migrated yet. We discovered that our +version control tool, [Subversion](http://subversion.tigris.org/), was unable to merge the changes between client branches on the old structure and the trunk on the new structure automatically. |