advice for my google code repo

[Giorgos Keramidas]

On Sun, 27 Feb 2011 03:12:58 +0100, Berke Viktor <berkeviktor at aol.com> wrote:
> hello,
>
> i host my project at google code in mercurial. it's a patchset for
> xchat (xchat-wdk). i used to host my additions and a diff in a single
> repo, but maintaining the patch was a PITA.
>
> now i wanted to have a repo for the xchat source code in "default",
> and a repo for xchat-wdk additions and the whole xchat code with my
> changes applied, let's call this repo "wdk".

If all you want is to be able to extract 'your diffs' from the vendor
code, why don't you use the default branch for the xchat upstream code
and patch your own version in a named branch?

This way you can always extract the diffs you have locally with:

    hg diff -r default:wdk

and you can see when you merged from upstream, what you merged, etc.

After every merge you can simply "hg push", and your new patched code
will be available to anyone using the repository.