Say I do:
hg clone web2py
I make changes to the code, then later another update comes out for
web2py and I want my changes added to the update. Can someone help me
with this process?
thx,
-wes
--
You received this message because you are subscribed to the Google Groups
"web2py-users" group.
if you already have a clone, make your changes, then commit them to
your local copy.
When you want updates do
hg pull web2py && hg merge
It should update and leave your changes, unless there is a conflict
which you will need a program such as "MELD" to solve.
-Thadeus
On Wed, Feb 3, 2010 a
On Feb 3, 2010, at 9:09 AM, Thadeus Burgess wrote:
> if you already have a clone, make your changes, then commit them to
> your local copy.
>
> When you want updates do
>
> hg pull web2py && hg merge
>
> It should update and leave your changes, unless there is a conflict
> which you will need a
What is wrong with http://mercurial.selenic.com/guide/
There is nothing special about hg+web2py together.
-Thadeus
On Wed, Feb 3, 2010 at 11:13 AM, Jonathan Lundell wrote:
> On Feb 3, 2010, at 9:09 AM, Thadeus Burgess wrote:
>
>> if you already have a clone, make your changes, then commit t
On Feb 3, 2010, at 9:19 AM, Thadeus Burgess wrote:
> What is wrong with http://mercurial.selenic.com/guide/
>
> There is nothing special about hg+web2py together.
I was hoping for something a little more concise, and also some guidance for
how to use my own clones (or whatever) on Google Code.
Massimo seems to prefer emailing patches rather than pulling from our
cloned repositories. Since he wants exact specific control over what
gets pulled in. Kind of like "quality control" until he trusts the
developer I suppose :) Linus Torvalds also prefers this approach of
diffs instead of clones f
On Feb 3, 2010, at 9:38 AM, Thadeus Burgess wrote:
> Massimo seems to prefer emailing patches rather than pulling from our
> cloned repositories. Since he wants exact specific control over what
> gets pulled in. Kind of like "quality control" until he trusts the
> developer I suppose :) Linus Torv
7 matches
Mail list logo