Re: M-. enhancements patch available

Paolo Amoroso <[email protected]> writes:

> I have never used CVS branches myself, but I have heard some negative
> comments on using them with SourceForge. Any information or comments from
> other developers/users?

I've not heard of any sourceforge-specific problems with using cvs
branches.  We've been using them to a limited extent in SBCL, which is
sourceforge-hosted, and nothing horrible has happened yet.

General advice for CVS branches :

1) tag the branch point at the time you create the branch

  $ cvs tag better-meta-dot-branch-point
  $ cvs tag -b  better-meta-dot-branch

This will make it possible to merge multiple times from the branch if
ever you need to.

2) Switch your working trees across to use the branch _before_ you make
   any changes that you want to commit to the branch.  If I forget
   to do this, I generally play it safe by checking out a new tree
   from the branch and feed my diffs from the original checkout area
   into it by hand

  $ cvs tag -b  better-meta-dot-branch
  $ cvs up -r better-meta-dot-branch

  ... or failing that ...

  $ cvs tag -b  better-meta-dot-branch
  ;; hack hack hack
  ;; "oops"
  $ cvs diff -u >/tmp/diffs
  $ cd .. ; mv ILISP old-ILISP
  $ cvs co -r better-meta-dot-branch ILISP
  $ cd better-meta-dot-branch
  $ patch </tmp/diffs

3) Life is simpler if you avoid repeated merges from the branch anyway.
   Create a new branch for the next round of changes after landing the 
   previous one

The cvs reference I always use is the one whose URL I can never
remember but which I always find by googling "loria cvs manual".  It's
probably just the HTMLized Texinfo manual anyway, but IWFM


I haven't looked at the new M-. stuff yet, but I certainly plan to -
it sounds very appealing.  I'm a big fan of edit-definitions anyway;
if these changes make it work more often, I'm all for it.


-dan

-- 

  http://ww.telent.net/cliki/ - Link farm for free CL-on-Unix resources 


-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf