A version control system is a piece of software that allows different authors to work collaboratively and asynchronously on a file, keeps track of their changes and alerts them when their edits are conflicting.
It can also be used by single authors to review and revert their changes.
It is distinct from a parallel editor, in which all authors edit the same file concurrently. In a parallel editor, the authors are forced to share all their edits with others, often restricting their creativity and causing data loss.
There are basically two approaches to version control: either snapshot-based (git, mercurial, svn, or their ancestors), or patch-based (darcs). Historically, patch-based systems have been very simple to learn and use, but slow, whereas snapshot-based systems can be extremely fast, but are usually hard to use for more than simple operations. As an example, cherry-picking does not work well in git/mercurial, and merging is sometimes plain wrong.
Pijul combines these approaches, by representing its data in a more general way than snapshot-based systems, that allows for a patch-based interface.
Some things are really wrong, like using three-way merge for version control in general: there are examples (even real-world ones) where Git, Mercurial and SVN just do the wrong thing. See this article for more details.
Less objectively, our experience with patch-based tools make us believe that this is possibly the simplest way to control versions.
Due to the relatively young age of Pijul, we obviously have little experience with that, but the fact that Pijul patches commute means that users can work on arbitrary partial checkouts.
Pijul makes it easy to get only a subset of patches, and takes care of dependencies between patches to produce files consistent with a giant remote repository.
If you are interested in trying it out for a large project, please contact us: we are interested in helping you out, and would love to get feedback.
Pijul is the mexican name of Crotophaga sulcirostris, a bird known to do collaborative nest building.
It improves on darcs by speed, support for branches. Compared to git/mercurial, the workflows are quite different:
Yes, we solved the exponential merge problem. The only caveat is that Pijul does not (yet) have an equivalent of
In other words, Pijul works in polynomial time for all patches that systems other than darcs know of. We’ve not yet thought all the theory of this through, but it might be added in the future.
Excellent question. Since Pijul operates on patches rather than snapshots, versions are essentially unordered sets of patches. How do we communicate a specific version number to one another? We solve this by abusing elliptic curve cryptography primitives.
The license is GPL2, or any later version at your convenience. This means in particular that Pijul is free software, and can therefore be used freely to develop any kind of projects, including commercial ones.
If you are interested in using our base library, libpijul, in a project with a commercial license, please contact us.
Yes, but we don’t have a good diff algorithm for them at the moment. Pijul could still perform reasonably well, depending on your exact problem, since you don’t have to download intermediate versions of binary files to work with a repository.
Indeed, we could have attempted to fix just that one bug in git merge where merging a whole branch at once, or all its commits individually, doesn’t always do the same.
Git contains the whole history of a project, so this seems possible. However, that would mean losing the patch-based nature of Pijul, which we think is more intuitive than the commits one (at the cost of requiring new algorithms).
In particular, cherry-picking in Pijul is done in such a way that you can cherry-pick from a branch, and then later merge other patches from that same branch. In git, cherry-picking means reorganizing history in such a way that the commits don’t have the same identity after the cherry-pick.
Moreover, git users sometimes report problems related to committing the inverse of a merge commit. In Pijul, there are no explicit “merge patches”, merging patches from a branch is equivalent to pulling from the branch.
In Git, cherry-picking means taking some commits, but not all, from another branch. This causes these commits to be rebased onto the current branch, losing their identity in the process. It usually works fine the first time it’s done, but then creates artificial conflicts if you want to cherry-pick again between the same branches, for no real reason.
We call that counter-intuitive, because it’s a fairly common workflow: many projects have branches name “stable” and “master”, and backport bugfixes from master into stable.
No. Semantics depends on the particular language you’re using, and Pijul doesn’t know about them.