Berkeley CSUA MOTD:Entry 10472
Berkeley CSUA MOTD
 
WIKI | FAQ | Tech FAQ
http://csua.com/feed/
2025/07/15 [General] UID:1000 Activity:popular
7/15    

2003/10/4-6 [Computer/SW/RevisionControl] UID:10472 Activity:moderate
10/4    RCS question: I've checked out (with a lock) revision 1.4 of a file
        which has a revision 1.9.  I want to check it in as revision 1.10
        and unlock it.  I thought this would work:
          ci -r1.4 -u1.10 test-contact.html
          but I get an error "ci: warning: redefinition of revision number"
        and revision 1.4 is still locked. I know RCS by default makes a new
        branch when you save changes to an old revision, but I want to keep
        the tree structure linear. Any pointers as to what I'm doing wrong?
        general question: how to check in a file and set the revision to the
        next main "trunk?" branch.
        \_ How about:
           $ mv test-contact.html test-contact.sav
           $ co -l test-contact.html
           $ mv test-contact.sav test-contact.html
           $ ci test-contact.html
           \_ not quite what I was looking for. I'd like a
           \_ ok, but that's not quite what I was looking for. I'd like a
              method that uses the ci and co or RCS commands? Thanks..
           \_ A much simpler question: What's the best way to make a new
              revision 1.10 that hass the contents of rev 1.4.  In other
              words "how to jump a previons revision to the top"?
              \_ co -l file; co -u1.4 file; ci file
                 \_ Aah. Excellent! You rock. you saved the day -op
              \_ A general way that works with cvs too:
              method that uses the ci and co or RCS commands? Thanks..
              words "how to jump a previons revision to the top"?
                 \_ Aah. Excellent! You rock. you saved the day -op
                 co -p1.4 file > file; ci file
2025/07/15 [General] UID:1000 Activity:popular
7/15    

You may also be interested in these entries...
2012/4/2-6/4 [Computer/SW/Languages/Java, Computer/SW/RevisionControl] UID:54353 Activity:nil
4/02    We use Perforce at work for revision control. It seems to work okay.
        Lately, a lot of the newer developers are saying that Perforce
        sucks and we should switch to Mercurial or Git. I have done some
        searching on the Internet and some others have this opinion. Added
        advantage is that Mercurial and Git are free. However, there would
        be some work to switch for the sysadmins and the developers.
	...
2008/1/10-12 [Computer/SW/RevisionControl] UID:48922 Activity:nil
1/10    In subversion (svn) is there a way to check out a file from
        a different BRANCH for diff purposes?
        \_ More specifically, do you want to compare your working copy of
           file.c with one in a branch?  Or do you want to compare the
           repository copy of file.c in trunk vs. file.c in branch?
           \_ compare a particular revision in trunk with a particular
	...
2007/10/3-7 [Computer/SW/RevisionControl] UID:48238 Activity:high
10/3    Is there a command in cvs that'll tell me what files I've
        editted/changed from the original cvs update?  \_ Use the -n flag.
        I normally use cvs -n update.  \_ Do you have to use CVS or can
        you migrate to something else?
           \_ Yeah, subversion is quite nice.  I hated it at first, though
              \_ How do you find out what files I've editted in svn?
	...
2006/10/24-26 [Computer/SW/WWW/Browsers] UID:44940 Activity:low
10/24   So why is Firefox at 2.0 now?  Granted this revision is a bit bigger
        than most minor revisions, but neither the program architecture or
        plugin interface changed much.
        \_ Marketing?  Maybe even free software needs marketing?
           \_ The marketing wants to be freeeeee!!1111
        \_ http://www.mozilla.com/en-US/firefox/2.0/releasenotes/#whatsnew
	...
2006/6/14-16 [Computer/Companies/Apple, Computer/SW/OS/OsX] UID:43382 Activity:nil
6/14    I am thinking of getting a 17" Macbook Pro to replace my 17"
        Powerbook G4. I haven't been following CPUs lately. Is there any
        reason to wait (i.e. something better is just around the corner)?
        \_ merom is supposed to be released around september.  it will be
           64 bit and use less power than the current chip.  if you can wait
           that long, you might as well.
	...