Can I maintain config files as a CVS branch w/o messing up mergemaster etc.?

From: Doug Lee (dgl_at_dlee.org)
Date: 04/29/04

  • Next message: Joan Picanyol: "Re: Can I maintain config files as a CVS branch w/o messing up mergemaster etc.?" 
    Date: Thu, 29 Apr 2004 17:59:18 -0400
To: freebsd-stable@freebsd.org

    I track STABLE and wonder if there's a clean way for me to use CVS to
    do it (without having the whole CVS repo on my box). Example: I
    modify /etc/rc.firewall and then cvsup my way up to a more current
    STABLE. The normal tactic is to hand-merge via mergemaster, but I
    think there should be a way for me to get CVS to do it:

        cvsup/mergemaster for fresh system (hypothetical of course)
        (current /etc/rc.firewall is now exactly the STABLE version)
        make local mods
        cvs commit mods (locally)
        cvsup
        use CVS instead of Mergemaster to merge in changes since last cvsup

    Problems:

    1. FreeBSD itself uses CVS, so I don't think I can just create a repo
    of my config files and pull in cvsups as a vendor branch.

    2. Mergemaster (which might still be useful alongside this sometimes)
    uses CVS Id strings to notice when a file hasn't really changed in the
    main FreeBSD repository, so even if I do start managing my config
    files by CVS despite the above issue, I think I'd be making
    Mergemaster throw a lot more stuff at me to do myself.

    Comments and ideas welcome. Please Cc me if that's ok. 

    -- 
Doug Lee           dgl@dlee.org        http://www.dlee.org
Bartimaeus Group   doug@bartsite.com   http://www.bartsite.com
"Pray devoutly, but hammer stoutly."
--Sir William G. Benham
_______________________________________________
freebsd-stable@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org"
  • Next message: Joan Picanyol: "Re: Can I maintain config files as a CVS branch w/o messing up mergemaster etc.?"

    Relevant Pages

    • Re: cvs question
      ... I did a cvsup on www & ... you can use anon cvs and something like: ... % setenv CVSROOT:pserver:freebsdanoncvs@anoncvs.FreeBSD.org:/home/ncvs ... CVSROOT is where the repository resides. ...
      (freebsd-questions)
    • Re: 5.2: will standard-supfile point to RELENG_5_2?
      ... stable-supfile tracks -STABLE (currently "RELENG_4" tag) ... I didn't touch the CVS info at the top of the ... +# FreeBSD-current source tree. ... +# CVSup allows you to download the latest CVS ...
      (freebsd-current)
    • CVSup rewrite - aka csup
      ... the really big missing feature is the status file support. ... The other big thing missing is support for CVS mode. ... already constitute a great documentation of the CVSup protocal, ...
      (freebsd-current)
    • Re: Can I maintain config files as a CVS branch w/o messing up mergemaster etc.?
      ... go ahead and maintain a private mirror of the CVS repo. ... The normal tactic is to hand-merge via mergemaster, ...
      (freebsd-stable)
    • RE: Trouble with NFSd under 6.1-Stable, any ideas?
      ... On the bright side, I didn't realize you could step through the cvs by date, ... start moving the cvs date forward till I get the problem back, once I nail ... I even did a cvsup to make sure ...
      (freebsd-stable)