Tracking upstream, push to CVS and merging back

[Robert Widhopf-Fenk]

On Sunday, January 20, 2008 at 01:36:43, Robert Widhopf-Fenk wrote:
> Hi,
> 
> I have a project which uses BZR (viewmail) which is Upstream
> and it is tracked in a larger project (xemacs packages)
> using CVS, but eventually also CVS gets changes by its own.
> 
> Currently Upstream is tracked by hand, but this is tedious
> once you got used to proper merge support, so I was looking
> for an easier way.

FYI ... After checking the build system for xemacs packages
I have decided to change the directory layout there and thus
avoid the oddities related to moving files from a subdir to
the root dir.  Looks like it will become really easy.

Cheers Robert