RE: [PEAR-DEV] Living with github ...
[email protected] (Васил Рангелов)
| Newsgroups | php.pear.dev |
|---|---|
| Message-ID | <[email protected]> |
Errr.... I'm not familiar with Hg, so I'm just guessing, but...
Your local copy needs to be a clone of bitweaver/pear-core, NOT a clone of pear/pear-core. That clone should have bitweaver/pear-core listed as a related remote path ("origin") and will probably NOT have pear/pear-core by default. From THAT point, you should manually add pear/pear-core as a related remote path, and do that same process as described previously.
I'm guessing the reason it's not working out is because your local copy is a clone of pear/pear-core instead, which somehow messes things up.
-----Original Message-----
From: Lester Caine [mailto:[email protected]]
Sent: Monday, September 10, 2012 7:49 PM
To: [email protected]
Subject: Re: [PEAR-DEV] Living with github ...
Васил Рангелов wrote:
> You should be able to do a "pull" from the original github repo, to your local copy, and in doing so, resolve any conflicts, if any. Then push the merged version back to your GitHub copy.
AH - I was thinking it had to be done via github, but that explains why
TortoiseHg lists pear/pear-core as a Related path :)
Except while it's synced nicely locally I can't get bitweaver/pear-core to
process the push of the merged copy :(
--
Lester Caine - G8HFL
-----------------------------
Contact - http://lsces.co.uk/wiki/?page=contact
L.S.Caine Electronic Services - http://lsces.co.uk
EnquirySolve - http://enquirysolve.com/
Model Engineers Digital Workshop - http://medw.co.uk
Rainbow Digital Media - http://rainbowdigitalmedia.co.uk
--
PEAR Development Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php