[mnet-devel] how to use darcs (icepick: admin request within)

[Arno Waschk]

In the way below cvs up leads to cvs complaining about the files being "in  
the way", which does not give nice results. Thus i am simply having two  
trees, and typing some diff|patch blah...

The darcs on w32 problem is darcs using parts of MAPI which easily don't  
exist on a machine without having MSOffice or the like installed. I was  
hinted a package to install some messenger things by MikeW, which at least  
changed the MAPI error code, but still darcs fails to send.
And I am pretty much tired of spending all my hacking time into some  
version control system which does not seem mature yet, and lacking quite a  
bunch of helpful cvs features in addition (Hauke agrees on that, BTW).  
Like what is the equivalent of cvs diff -D XZY or cvs up -D ABCD ???

Arno

On 27 Jul 2004 12:23:06 -0300, Zooko <zooko at zooko.com> wrote:

> I'm installing darcs on my mac laptop so that I can try out my  
> suggestions myself before posting them.
>
> I guess the way to set up the "combined CVS/darcs" repository that I  
> mentioned would be to get current CVS sandbox and current darcs repo and  
> then just copy one into the other.
>
> Something like:
>
> cvs co mnet_new
> mv mnet_new mnet # we don't use that other name anymore...
> mkdir mnet_from_darcs
> cd mnet_from_darcs
> darcs inittree
> darcs pull http://mnetproject.org/repos/mnet_new_mt
> cd ..
> cp -rf mnet_from_darcs/* mnet/
> rm -rf mnet_from_darcs
>
> Now cd into mnet and run "cvs diff -u" to see all the differences  
> between the two versions (according to CVS).  Alternately, do "cvs  
> update -Pd -A -C" to erase local changes and set the source files to be  
> the same as the current CVS version, then run "darcs diff -u" to see all  
> the differences between the two versions (according to darcs).
>
> Once you have merged the two branches, so that the current source files  
> in your "mnet" directory contain the source code which you think ought  
> to be the current source code, then you can run "cvs commit" to push the  
> new version to the CVS repository and "darcs record" followed by "darcs  
> push" to push the new version to the darcs repository at  
> mnetproject.org.  (See below about "darcs push".)
>
> Then, as far as I understand, the "easy merging" thing I described below  
> should work.  But I have not tried this yet.
>
>
> I empathize with your frustration about us switching to darcs and it  
> causing you problems.  When we started using darcs, the idea was to keep  
> supporting CVS (using a trick like the one described in this e-mail),  
> but then the first three people who tried darcs (me, icepick, hauke)  
> were so pleased with it that we each stopped using CVS entirely, so the  
> desire to support CVS waned until you started having all this trouble.
>
>
> I wonder if the "darcs on arno's w32 doesn't send e-mail" problem is...
>
>
> Regards,
>
> Zooko
>
> _______________________________________________
> Mnet-devel mailing list
> Mnet-devel at lists.mnetproject.org
> http://lists.mnetproject.org/mailman/listinfo/mnet-devel
>



-- 
http://www.arnowaschk.de