Re: MFC'ing

[Kaz Kylheku]

Philip M. Gollucci [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED]...
 Thanks in advanced. Sorry for the crosspost, but I know some of you FreeB
 SD 
 developers do this all the time.

But this is a CVS newsgroup/mailing list, not a FreeBSD forum. The
term MFC means nothing here, but looking up a FreeBSD FAQ reveals
that:

  16.15. What does MFC mean?

  MFC is an acronym for ``Merged From -CURRENT''. It is used in
  the CVS logs to denote when a change was migrated from the
  CURRENT to the STABLE branches.

In other words, it denotes a merge in the wrong direction (from a CVS
perspective). To the rest of the world, MFC either means nothing, or
stands for Microsoft Foundation Classes, a proprietary C++ framework
for GUI development on Windows. :)

Don't assume that everyone understands your tribal acronyms.

CVS has little support for this MFC'ing. Suppose that a feature is
developed on the trunk, and that feature consists of multiple commits
over many days. Those commits will be interleaved with other commits
done by other people that have nothing to do with that feature. To
create a patch, you will have to unravel your changes from among those
irrelevant ones manually.

If you suspect that a feature you are doing on the trunk may be of
interest to other lines of development* then you should represent it
as its own branch, with a tagged branchpoint and all. Such a feature
isolation branch is simple to merge  wherever you want.

---
* ``line[s] of development'' is a trademark of Shi^H^H^HBitMover,
Inc., makers of the BitKeeper version control system.
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

MFC'ing

[Philip M. Gollucci]

Thanks in advanced. Sorry for the crosspost, but I know some of you FreeBSD 
developers do this all the time. Note the naming scheme ... wink wink.
Okay fine, so I couldn't resit the developer like apache cvs tags :)

say I have
branches: RELENG_1(stable/prod), RELENG_2(release/qa), HEAD(current/devel)
branch point tags:RELENG_1_BP, RELENG_2_BP
tags: p6_RELENG_1_0_PRE1, p6_RELENG_1_0_PRE2, RELENG_1_0, RELENG_1_1_PRE1 
   p6_RELENG_1_1, RELENG_2_0

eventually equivalents for RELENG_3 will be created from HEAD and support for 
RELENG_1 dropped.

now say my respository has 4 files
file1.pm
file2.pm
dir2/file3.pm
dir1/file4.pm

I change the last 3 on HEAD.  Now a week later I want to MFC these changes and 
only these changes from HEAD to RELENG_2 branch. One of the big problems I 
have here is say that during the previously mentioned week, I change file1.pm 
and dir/file4.pm.  I only want the initial changes MFC'ed as I have not had a 
burn in period long enough to move the back from the devel branch (HEAD) to 
our qa branch(RELENG_2). I think I have to add more tags to the tree to do 
this, but I am not sure.

Please don't confuse this with wanting to merge branches into the trunk.  That 
I know how do and it is not what I want.

From FreeBSD, theres how we MCF new files.
How do we change this to MFC multiples that already exist ?

 % cd sys/alpha/include
% cvs update -rRELENG_4
cvs update: Updating .
U clockvar.h
U console.h
...
% cvs update -kk -Ap smp.h  smp.h
===
Checking out smp.h
RCS:  /usr/cvs/src/sys/alpha/include/smp.h,v
VERS: 1.1
***
% cvs add smp.h
cvs add: scheduling file `smp.h' for addition on branch `RELENG_4'
cvs add: use 'cvs commit' to add this file permanently
% cvs commit




-- 
END 
-- 
Philip M. Gollucci [EMAIL PROTECTED] 301.474.9294 301.646.3011 (cell) 

Science, Discovery,  the Universe (UMCP) 
Webmaster  Webship Teacher 
URL: http://www.sdu.umd.edu 

eJournalPress 
Database/PERL Programmer  System Admin 
URL : http://www.ejournalpress.com 

Resume : http://p6m7g8.net/Resume 



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs