Re: [Quilt-dev] merging with upstream and adding new files

[jerome lacoste]

> I am not entierly convinced by this subsection. It's a bit too long for
> a simple example,

I agree. 

> most probably because you are mixing 3 different
> concepts: exporting the series to a different base, updating the base in
> place, and the confusing footnote. The first concept was already covered
> by your "Sharing your patches" section above, so I don't think it should
> be mentioned again here. You should really dedicate the subsection to a
> typical in place codebase update (and we don't care how the update is
> done, manually or through CVS, it doesn't matter)

It matters in the sense that with CVS, if you do it wrong, you have to
start from scratch. Hence my confusing footnote.

>. Andreas managed to
> put this in 3 lines, so you should be able to come up with something
> significantly smaller than what you have here. Remember that this PDF
> document is meant to give short, typical examples of quilt uses. It's
> not meant to cover all possibilities nor explain things in deep detail -
> there's a manual page for that.

Agree. But on the other side merging with upstream is an important
part of the usage of quilt. Isn't it?

> Thanks,

Give me some days before the next doc update.

Cheers,

Jerome