aboutsummaryrefslogtreecommitdiffstats
path: root/devel/codeville/pkg-descr
blob: ec24d7f237c5cc54f37481497e4bcc577d74c108 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
Codeville is a distributed version control system. It began with a novel
idea for a merge algorithm and has grown from there. It is designed to
be easy to use and scale from small personal projects to very large
distributed ones. If you'd like to know why there is a need for new
merge algorithms, consider what the lead monotone developer had to say:
http://article.gmane.org/gmane.comp.version-control.monotone.devel/3264

Codeville works by creating an identifier for each change which is
done, and remembering the list of all changes which have been applied
to each file and the last change which modified each line in each
file. When there's a conflict, it checks to see if one of the two
sides has already been applied to the other one, and if so makes
the other side win automatically. When there's an actual not
automatically mergeable version conflict, Codeville behaves in
almost exactly the same way as CVS.

WWW: http://bsdforge.com/projects/devel/codeville/