Strategies for push/merge problem?

Douglas Philips dgou at mac.com
Tue Jul 15 08:55:01 CDT 2008


On or about 2008 Jul 15, at 2:55 AM, Arne Babenhauserheide indited:
> Am Dienstag 15 Juli 2008 04:45:41 schrieb Douglas Philips:
>> 	"main" repo > local clean copy -> <n> working clones.
>>
>> Flow is that when I want to get "main" changes, I pull to local clean
>> copy, then pull again into whatever working clones I care about.
>> Changes get pushed form the working clones to the pushee tree, never
>> to local clean copy. Local clean copy exists so that I can <snap
>> fingers>clone</snap fingers> to get a fresh tree to do a one-off, or
>> whatever.
>
> Problem: "hg push" doesn't push to the pushes tree automatically.

Right. Missing bit of config: User-wide path definition for simple push:
     % push group
     % push beta
or whereever that quick fix commonly needs to go...

I do wish that clone didn't default to pushing back to the same tree...

> A clean copy with an incoming hook (push on incoming) could solve  
> this.

if the hook's push never fail.. and doesn't need credentials and ...

> Maybe a "exact" option (or similar) which copies over the default and
> default-push paths would help here, but it might become a security  
> problem
> (for example if I use Username and Password in my push path).

I think there are already some discussions about having some of  
the .hgrc entries participate in a clone... but I don't recall any  
recent discussions and wasn't following it closely.

     --Doug



More information about the Mercurial mailing list