[Top][All Lists]

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

Re: Working directory & laptop?

From: Pierre Asselin
Subject: Re: Working directory & laptop?
Date: 8 Feb 2002 21:24:04 -0600

Eric Siegerman <address@hidden> writes:

>On Fri, Feb 08, 2002 at 09:55:45AM -0600, address@hidden wrote:
>> If I copy my working directory to my laptop, do some modifications, copy 
>> it back and do a commit, will I have any issues

>[pitfalls described]
>This is exactly the sort of confusion CVS can help with, so why
>not take advantage of that?  Instead of copying your desktop
>sandbox, do a fresh checkout directly onto the laptop; then you
>can commit those changes independently of your work on the
>desktop machine.  The standard CVS multiuser thing; it's just
>that both users happen to be you :-)

I'll second that and raise it:  install CVS on the laptop and
import the sources there.

    cvs tag trip_bp             : branch point
    cvs tag -b -rtrip_bp trip   : branch
    (cd somewhere else...)
    cvs export -rtrip <project>
    scp -r <project> address@hidden:<project>
    rm -rf <project>            : the exported tree, that is

    export CVSROOT=~/cvsroot
    cvs init
    cd <project>
    cvs import -m'work on trip' <project> VENDOR start_of_trip
    cd ..
    rm -rf <project>
    cvs checkout <project>
    cd <project>
    (take it away...)

When you come back,
    cvs commit
    cvs tag end_of_trip
    cvs rdiff -kk -rstart_of_trip -rend_of_trip <project> > trip.patch
    scp trip.patch address@hidden:trip.patch

    cvs checkout -rtrip <project>       : new sandbox on the branch
    cd <project>
    patch -p2 < ~/trip.patch
    (the patch should apply cleanly)
    cvs commit
    cvs tag trip_endpoint

Now you can go to a regular sandbox and merge your work:
    cvs update -jtrip_bp -jtrip_endpoint

The only drawback is that your main repository sees only the start
and endpoints of what you did on your laptop, without the intermediate
stages.  Then again, do you want them?  Personally, I only use the
intermediate stages between milestones as fall-back positions in
case I mess up.  When things are solid, I stop caring about the
micro-history.  Just make sure your "trip" branch is in good shape
before you merge it.  If not, you should first polish it up on the
main computer, in the sandbox that's on the branch.

BTW, I'm assuming both computers use a unixoid OS, but all of this can
be done in Windows.

Pierre Asselin
Westminster, Colorado

-----= Posted via Newsfeeds.Com, Uncensored Usenet News =----- - The #1 Newsgroup Service in the World!
-----==  Over 80,000 Newsgroups - 16 Different Servers! =-----

reply via email to

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