[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging from one module into another

From: Mark D. Baushke
Subject: Re: Merging from one module into another
Date: Wed, 23 Jun 2004 00:21:15 -0700

Hash: SHA1

Jean-Christian Imbeault <address@hidden> writes:

> At my company we have a repository with two
> projects (I hope I have the terminology right).
> One project is A and the other is A_DEV.

I suspect you mean 'module' here, but sure,
calling it a 'project' is fine too.

> Our developers work and commit only into A_DEV.
> When everything is ready for release we move the
> changes into A and release.


> My question is what is the easiest (or best?)
> way of merging the changes from A_DEV into A? I
> would like to be able to do something like:
> # cvs checkout A_DEV
> # cvs checkout A
> # cvs update (but use files from A_DEV to update A)
> but I can't figure out the proper syntax ...

I would probably make A_DEV be a branch of A or A
a branch of A_DEV (there are pluses and minuses
for both approaches).

> I'm new to cvs so please bare with me if this is
> a newbie question ....

 cvs checkout A_DEV
 cd A_DEV
 cvs tag A_production_bp
 cvs tag -b A_production
 ....time passes...
 cvs tag A_production_snapshot

 ... in another tree ...
 cvs checkout -r A_production -d A A_DEV
 cd A
 cvs update -jA_production_bp -jA_production_snapshot
 ...verify that things still work and fix any conflicts...
 cvs commit it, test it, release it...
 cvs tag my_really_important_release_tag

Now you can put urgent production fixes into the
A_production branch and merge in A_DEV work
whenever it is ready again...

Or, you could choose to just create a new branch
tag off of A_DEV whenever it is ready to go and
then only ever put critical bug fixes into that
branch as well as the A_DEV top-of-tree so that
those fixes will be present in any future new
branch you create.

        Good luck,
        -- Mark
Version: GnuPG v1.2.3 (FreeBSD)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]