Hi,
You may want to check :
http://www.cvshome.org/docs/manual/cvs_5.html#SEC61

 - Work on a directory where you have checkout using no tag
 - cvs -q update -P -jXJAVADOC_REFACTORING

I then have all merging done locally
I have 3 conflicts (only)

Make sense ?

Vincent


> -----Original Message-----
> From: [EMAIL PROTECTED] 
> [mailto:[EMAIL PROTECTED]] On Behalf 
> Of Aslak Helles�y
> Sent: samedi 23 mars 2002 17:36
> To: [EMAIL PROTECTED]
> Subject: [Xdoclet-devel] XJAVADOC_REFACTORING done!
> 
> 
> Ok girls and boys. The long awaited xjavadoc is now 
> successfully integrated with xdoclet, and I'll commit it all 
> to the main branch tomorrow.
> 
> -But I don't know how to do it! I'm on WinCVS. Any help is 
> greatly appreciated. Dim?
> 
> Aslak
> 
> 
> _______________________________________________
> Xdoclet-devel mailing list
> [EMAIL PROTECTED]
> https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
> 


_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to