[PATCH 2 of 4] clone to master bookmark if available

timeless timeless at gmail.com
Sun Nov 13 06:33:16 CST 2011


If your shared repo with Arne isn't the repo other developers are
using you can certainly put work there.

As for multiple heads, that's really an agreement between you and
Arne. If I was working with Arne on a liquid (unfinished) feature, I'd
try to merge (or rebase) to the tip Arne was using before pushing to
Arne.

On 11/11/11, Sean Farley <sean at mcs.anl.gov> wrote:
>>
>> Yes, that's a case where you'd use liquid. One of you will have a repo
>> which is mutable and supports liquid (possibly anne with you pushing).
>>
>
> So, I can push multiple heads (remember I haven't merged changes into the
> working tip) a liquid phase to a shared repo and Arne can pull from that
> without other developers gettings multiple heads?
>
>
>> On 11/11/11, Sean Farley <sean at mcs.anl.gov> wrote:
>> > On Fri, Nov 11, 2011 at 7:35 AM, timeless <timeless at gmail.com> wrote:
>> >
>> >> Please consider Phases instead of this complicated Behavior Change.
>> >>
>> >> Your argument seems to partially be of the form "I want to be able to
>> >> have wanton sex for the experiences and not risk infecting my spouse."
>> >>
>> >
>> > Well, what's wrong with being sexy?
>> >
>> >
>> >> Thankfully, in computing space this is possible. In Hg, you do this:
>> >>
>> >> hg clone http://spouse/repo workspace
>> >> # incoming is spouse
>> >> hg clone workspace playspace
>> >> # incoming is workspace
>> >> cd playspace
>> >> # play
>> >> hg pull http://random/space
>> >> hg pull http://another/space
>> >> hg pull -R ../workspace
>> >> # pull from spouse to workspace
>> >> hg pull
>> >> # transitive pull from spouse+workspace into playspace
>> >>
>> >> You don't arbitrarily hg push from playspace to workspace, that would
>> >> be reckless. And you certainly don't push from workspace to spouse
>> >> without reviewing, that would be grouns for divorce.
>> >>
>> >> Phases will give you some of the mutability you want. Things which
>> >> aren't for publishing won't be pushed to public servers.
>> >
>> >
>> > Phases seems interesting but still a little unclear if I want to share
>> > my
>> > playspace with, for example, Arne? The particular changesets in question
>> > break some functionality and I need his help to fix them. Is this what
>> the
>> > liquid phase is for? To me, it would make a little more sense to have
>> this
>> > on a bookmark, pushing two heads, but have mercurial not force the other
>> > developers to deal with them just yet (i.e. by default, don't show heads
>> > that are on bookmarks)
>> >
>>
>> --
>> Sent from my mobile device
>>
>

-- 
Sent from my mobile device


More information about the Mercurial-devel mailing list