| 1 |
On Thu, Feb 19, 2009 at 11:54:55AM -0800, Donnie Berkholz wrote: |
| 2 |
> > A distfile-only Manifest should merge extremely well, as it will seldom |
| 3 |
> > have conflicts. |
| 4 |
> I'd considered only the distfiles in manifests. There will still be a |
| 5 |
> conflict every time there is a newer version in one branch (say an |
| 6 |
> overlay, where the files are copied directly across and one bump is |
| 7 |
> made) and older versions are deleted in the other branch (during a |
| 8 |
> typical tree cleanup), right? |
| 9 |
Simultaneous add and delete being merged in the same spot of the file is |
| 10 |
the only time I can create a conflict. This case already happens with |
| 11 |
CVS, we just 'solve' it by doing regen instead of fixing by hand. |
| 12 |
|
| 13 |
Branches A,B |
| 14 |
|
| 15 |
Cases: |
| 16 |
1. DIST line already exists on A, not on B |
| 17 |
Merge A->B - no conflict |
| 18 |
2. Identical DIST line exists in both A and B but was added separately. |
| 19 |
Merge A->B - Git sees that the exact changeset already exists and no |
| 20 |
conflict :-). |
| 21 |
3. A has a line added. B has a line removed right in the same spot as |
| 22 |
the added line. |
| 23 |
Merge A->B - Git triggers a conflict. |
| 24 |
|
| 25 |
-- |
| 26 |
Robin Hugh Johnson |
| 27 |
Gentoo Linux Developer & Infra Guy |
| 28 |
E-Mail : robbat2@g.o |
| 29 |
GnuPG FP : 11AC BA4F 4778 E3F6 E4ED F38E B27B 944E 3488 4E85 |
Archives