1 |
On 08:05 Mon 16 Feb , Maciej Mrozowski wrote: |
2 |
> I've been playing in git controlled overlay (kde-testing) for quite some time, |
3 |
> and I found one thing particularly disturbing - merge conflicts related to |
4 |
> Manifests. |
5 |
|
6 |
Good to hear about some real experience using a more interesting |
7 |
workflow than other overlays, w/ branches etc. |
8 |
|
9 |
> This is especially painful when one wants to do quick cherry-pick from other |
10 |
> branch. While ChangeLogs, ebuilds and matadata.xml is usually merged |
11 |
> automatically or with just some simple user interaction (like choose |
12 |
> remote/local/delete/use modified etc) - Manifests always requires using git |
13 |
> mergetool. |
14 |
|
15 |
> Why? Because otherwise every cherry-pick would require separate another commit |
16 |
> only with purpose to fix Manifests. And the most important is - those |
17 |
> conflicts on Manifests requires extra user interaction (takes most of the |
18 |
> time). |
19 |
|
20 |
Hmm. One way to deal with this is keeping Manifests split in a 2nd |
21 |
commit as they are in CVS. That way you would only cherrypick the |
22 |
non-Manifest changes, then presumably autogenerate & commit the Manifest |
23 |
(repoman cherry-pick?). |
24 |
|
25 |
What are some other options? We could have a manifest directory instead, |
26 |
with 1 file inside per distfile. |
27 |
|
28 |
> Hence the question - is it possible to *not* store and .gitignore Manifests is |
29 |
> git controlled portage repository? |
30 |
> As portage metadata is regenerated, maybe it would be as well possible to |
31 |
> regenerate manifests on server? |
32 |
> I guess it would be possible but ineffective as it would require all needed |
33 |
> distfiles to be present as well and this is unacceptable. |
34 |
|
35 |
Well, if you did the generation on the master mirror, this would be fine |
36 |
for the main tree. How about overlays, though? |
37 |
|
38 |
-- |
39 |
Thanks, |
40 |
Donnie |
41 |
|
42 |
Donnie Berkholz |
43 |
Developer, Gentoo Linux |
44 |
Blog: http://dberkholz.wordpress.com |