Modifying Mozilla code on a separate Hg repo?

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

Modifying Mozilla code on a separate Hg repo?

Alex Vincent
Mercurial scares me, simply because I've never worked with it before.
Yet I sense instinctively that it will be easier to work with a pure-Hg
solution and to modify copies of the cvs-trunk-mirror (1.9-base)
repository... hosted on locations other than hg.mozilla.org.

Here's the scenario I envision, and I hope someone will tell me how I
can do all these:

* I want to host a copy of the cvs-trunk-mirror repository on mozdev (or
at Skyfire, behind an internal firewall), and check out from that
location instead of from hg.mozilla.org.  Then I would make changes to
that repository instead of the official cvs-trunk-mirror.  (We do modify
  native Mozilla code a bit to meet our needs.)

* mozilla.org does updates to cvs-trunk-mirror for 1.9.0.x releases,
which I want to import as a batch into the private repository.

I'm looking for a hg-only solution instead of a hybrid cvs+svn solution
which I've been doing for several months now, which is a pain in the
butt to maintain already.  Any directions you could provide would be
welcome.

Alex Vincent
Skyfire Labs, Inc.



_______________________________________________
dev-documentation mailing list
[hidden email]
https://lists.mozilla.org/listinfo/dev-documentation
Reply | Threaded
Open this post in threaded view
|

Re: Modifying Mozilla code on a separate Hg repo?

Robert Kaiser
Alex Vincent wrote:
> * I want to host a copy of the cvs-trunk-mirror repository on mozdev (or
> at Skyfire, behind an internal firewall), and check out from that
> location instead of from hg.mozilla.org. Then I would make changes to
> that repository instead of the official cvs-trunk-mirror. (We do modify
> native Mozilla code a bit to meet our needs.)

Erm, every checkout _is_ a copy of the repository, this is in the nature
of all DVCS solutions - and you can clone as many repositories as you
like and merge them together, wherever they sit, on your machine, on
your copany's, on mozdev, on hg.mozilla.org or wherever.

Robert Kaiser
_______________________________________________
dev-documentation mailing list
[hidden email]
https://lists.mozilla.org/listinfo/dev-documentation
Reply | Threaded
Open this post in threaded view
|

Re: Modifying Mozilla code on a separate Hg repo?

Benjamin Smedberg
In reply to this post by Alex Vincent
Alex Vincent wrote:

> * I want to host a copy of the cvs-trunk-mirror repository on mozdev (or
> at Skyfire, behind an internal firewall), and check out from that
> location instead of from hg.mozilla.org.  Then I would make changes to
> that repository instead of the official cvs-trunk-mirror.  (We do modify
>  native Mozilla code a bit to meet our needs.)
>
> * mozilla.org does updates to cvs-trunk-mirror for 1.9.0.x releases,
> which I want to import as a batch into the private repository.

I do not think we are planning on maintaining cvs-trunk-mirror after the
next few days... once mozilla-central becomes the main development trunk, we
will stop mirroring cvs-trunk-mirror.

What are you actually trying to do? Track changes to the 1.9.0.x codebase?
Track changes to the mozilla-central codebase? Something else?

There are several ways to solve this problem, depending on what you're
actually trying to accomplish.

--BDS
_______________________________________________
dev-documentation mailing list
[hidden email]
https://lists.mozilla.org/listinfo/dev-documentation
Reply | Threaded
Open this post in threaded view
|

Re: Modifying Mozilla code on a separate Hg repo?

Alex Vincent
Benjamin Smedberg wrote:
  > What are you actually trying to do? Track changes to the 1.9.0.x
> codebase?

Yes, exactly - while maintaining my own code changes as well.
_______________________________________________
dev-documentation mailing list
[hidden email]
https://lists.mozilla.org/listinfo/dev-documentation
Reply | Threaded
Open this post in threaded view
|

Re: Modifying Mozilla code on a separate Hg repo?

Benjamin Smedberg
Alex Vincent wrote:
> Benjamin Smedberg wrote:
>  > What are you actually trying to do? Track changes to the 1.9.0.x
>> codebase?
>
> Yes, exactly - while maintaining my own code changes as well.

So... I don't think you want to use mozilla-central or cvs-trunk-mirror for
this. cvs-trunk-mirror is not going to be maintained past RC1, and
mozilla-central will diverge from the 1.9.0.x branch.

Instead, if you want to use mercurial, you should:

* take a Firefox source tarball (say, RC1) and unpack it
* create a new hg repository in that directory (using hg init)
* commit your customizations
* when a new Firefox is released:
** hg update to your Firefox RC1 revision
** unpack the new tarball
** commit the new sources
** hg merge to merge your changes

Make sense?

ASCII-art graph:

Firefox3RC1-->Firefox3RC2-->Firefox3.0.1
       \                \               \
     FF3RC1+custom-->FF3RC2+custom-->FF301+custom

--BDS
_______________________________________________
dev-documentation mailing list
[hidden email]
https://lists.mozilla.org/listinfo/dev-documentation