diff options
Diffstat (limited to 'wiki/dev')
| -rw-r--r-- | wiki/dev/builds.md | 2 | ||||
| -rw-r--r-- | wiki/dev/merging-structural-changes.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/wiki/dev/builds.md b/wiki/dev/builds.md index 8f334a1..abe3d19 100644 --- a/wiki/dev/builds.md +++ b/wiki/dev/builds.md @@ -37,7 +37,7 @@ person—“creativity,” “morality,” “curiosity,” and so on. Extensible. Understood. In the middle tier: Simple. Fast. Unit tests. Part of the project. Environment independent. At the top: Metrics. Parallel builds. Acceptance tests. Product caching. IDE -integration.](/media/dev/builds/buildifesto-pyramid) +integration.](/media/dev/builds/buildifesto-pyramid.png) Builds, and software engineering as a whole, can be described the same way: at the top of the hierarchy is a working system that solves a problem, and at the diff --git a/wiki/dev/merging-structural-changes.md b/wiki/dev/merging-structural-changes.md index a47fdcc..d1c7a9c 100644 --- a/wiki/dev/merging-structural-changes.md +++ b/wiki/dev/merging-structural-changes.md @@ -17,7 +17,7 @@ changes when merging structural changes to the same files. ## The Preferred Outcome  +merge.](/media/dev/merging-structural-changes/ideal-merge-results.png) The diagram above shows a very simple source tree with one directory, `dir-a`, containing one file with two lines in it. On one branch, the file is modified @@ -31,7 +31,7 @@ merging. ## Subversion  +change.](/media/dev/merging-structural-changes/subversion-merge-results.png) There are two merge scenarios in this diagram, with almost the same outcome. On the left, a working copy of the branch where the file's content changed is @@ -69,7 +69,7 @@ ignoring changes. ## Mercurial  +change.](/media/dev/merging-structural-changes/mercurial-merge-results.png) Interestingly, there are tools which get this merge scenario right: the diagram above shows how [Mercurial](http://www.selenic.com/mercurial/) handles |