Branch?

[John D. Mitchell]

On 9/7/06, Paul Moore <p.f.moore at gmail.com> wrote:
[...]
> Oh, I agree on that - and I'm fully in favour of the fact that policy
> isn't mandated. But I think there's a model I'm trying to achieve
> which isn't supported. Maybe my model isn't a good one, if so I'd be
> happy to be told why, or maybe there's a way of doing this that I've
> missed. Again, I'd love any pointers.
>
> Maybe an example would help.
>
> Start with a repository, A. I want to try out a new UI, so I clone
>
>     hg clone a A-newUI
>
> Now, I work further on both A and A-newUI. No problem with that.
>
> However, what I want to do is to have a central repository, "master",
> into which I can check both A and A-newUI, *without having to merge*.
> I want somewhere that I can record both parallel lines of development.

Setup the equivalent of a user-private branch for the stuff you want
on the shared server but not yet integrated into the mainline.

I.e. have a convention about where you put your repos on the shared
server and have an area for your personal, "private" repos.

E.g.,
.../main/.../A-UI  -- shared, mainline repo
.../users/pfmoore/A-UI   -- your user-private repo

I think that they (currently) have to be separate repos to do this as
I don't (yet) see any way to do partial slices of repos.

Hope this helps,
John