diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2009-12-03 16:36:14 +0100 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2010-01-06 09:49:24 -0800 |
| commit | 6d930cd572463ede104126ac68a84bc283a1aa3d (patch) | |
| tree | f72863c89518b5adbf7935fe752e5149d9cc317d /org.eclipse.jgit.pgm | |
| parent | b0772d7a5c74d68a31697ebc971438faa7a132f5 (diff) | |
| download | jgit-6d930cd572463ede104126ac68a84bc283a1aa3d.tar.gz jgit-6d930cd572463ede104126ac68a84bc283a1aa3d.zip | |
Add file content merge algorithm
Adds the file content merge alorithm and tests for merge to jgit.
The merge algorithm:
- Gets as input parameters the common base, the two new contents
called "ours" and "theirs".
- Computes the Edits from base to ours and from base to theirs with
the help of MyersDiff.
- Iterates over the edits.
- Independent edits from ours or from theirs will just be applied
to the result.
- For conflicting edits we first harmonize the ranges of the edits
so that in the end we have exactly two edits starting and ending
at the same points in the common base. Then we write the two
conclicting contents into the result stream.
Change-Id: I411862393e7bf416b6f33ca55ec5af608ff4663
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
[sp: Fixed up two awkard comments in documentation.]
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit.pgm')
0 files changed, 0 insertions, 0 deletions