DevelopPackaging, Was: Bug#529160: zita-convolver: FTBFS: dpkg-genchanges: failure: cannot read files list file: No such file or directory

[Reinhard Tartler]

Felipe Sateler <fsateler at gmail.com> writes:
>> Registering the remote archive is a perquisite for all steps that touch
>> the remote archive. It only needs to be done exactly once. Splitting
>> it out would be in the "tradition of code reuse".
>
> I'm not sure about this... I don't think the wiki should document every single 
> git usage we have. We should be able to expect people to get to know a bit of 
> the tools we use after some time working with us. Ie, we should document only 
> what is necessary: stuff for beginners to understand the workflow, and team-
> specific tools and guidelines.

OK

>> > Some comments:
>> > I would recommend all packagers not committing directly to use rebase, I
>> > think you can't preserve merge information in a patch series, the
>> > commiter may need to do conflict resolution.
>>
>> I am aware about the merge vs. rebase discussion. For this particular
>> use case, I think rebase is better. Here, you are encouraged to do
>> small, focused commits anyway, and I don't expect they will do heavy
>> development here. If they do, the will be aware about this discussion
>> anyway use merging instead anyway. On the other hand, the cleaner diff
>> history makes using git-format-patch(1) easier and let's it produce more
>> useful output, I think.
>
> I don't understand this. You seem to be arguing the same point as I did 
> (always recommend rebase).

I think I misread your first comment (sorry, I'm no native speaker) and
think we both agree on recomminding rebase.

So your point is that we shouldn't recommend merging at all? - Hm, that
has a point. people that know what they are doing will know better
anyways, so I guess you're right here.

-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4