Multiple working directories for a single repo

[Peter Arrenbrecht]

Martin, instead of trying to merge patches, you can usually just start
a new patch after the one you would like to change. Then you fold this
new patch into the older one when you've taken it back home (or to
work, wherever the other changed copy is).

We do this when working together on patch queues. We try to avoid
touching each other's patches, instead introducing add-on patches to
be folded by the original patch owner. This also simplifies review of
things others want to change in your patches.

-peo

On Nov 21, 2007 9:32 AM, Martin Geisler <mg at daimi.au.dk> wrote:
>
> Dustin Sallings <dustin at spy.net> writes:
>
> > On Nov 20, 2007, at 11:24, Martin Geisler wrote:
> >
> >> and turn the patches into normal changesets again with
> >>
> >>  hg qdelete -r qbase:qtip
> >>
> >> In my experience this works great.
> >
> >       That's with only a single working dir, though.  When you edit
> > the changesets, their IDs change.  I'd expect that'd cause your other
> > working dirs to lose their minds.
>
> You're right and I have yet to figure out how to work with more that
> one repository when doing this. I have resorted to simply copying the
> whole repository back and forth with the patches. That has worked okay
> since I am only in one place at a time (university or home).
>
> I know that you can version control the patches, but I have not yet
> tried that. To me it sounds really scary -- you are no longer simply
> tracking changes to files, you are tracking changes to changes to
> files... argh! :-)
>
> Is it not extremely easy to shoot oneself in the foot when doing this?
> The idea of merging patches does not appeal at all to me. But maybe it
> isn't that bad, especially if I'm the only person working on the
> patches? I guess I'll have to try it out :-)
>
> --
> Martin Geisler
>
>       Do your secure multi-party computations (SMPC) with VIFF,
>               the Virtual Ideal Functionality Framework.
>                      Download at http://viff.dk/
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>