LINUX.IE, website of the Irish Linux Users' Group
Tux rules!

   
Home
New Users
Articles
Download
Projects
Community
Vendors

  Print Version
Email to...
 
Archives:


planetILUG

Recent News

News Archive


Join the
ILUG
on FaceBook


Join the
ILUG
on LinkedIn


Join the
ILUG SETI
Group



















 
 :: Mailing Lists

[ILUG] cvs merge question...

[ILUG] cvs merge question...

Stephen Shirley diamond at skynet.ie
Tue Dec 10 12:40:03 GMT 2002


On Tue, Dec 10, 2002 at 12:28:59PM +0000, John Allen wrote:
> Just to be sure you are not going insane, do a 
> cvs diff -r [rev from blah] -r [rev from balh-test] file-you-know-is-different

I'm insane already, but it doesn't seem to be affecting this. I've
checked that, and it still tells me that there's one line more in the
main branch than the sub-branch. Nargh.

Steve
-- 
"The Catholic Church may wish to consider conducting Mass in Pig Latin,
as it combines the solemnity of Latin with the accessibility of English."



More information about the ILUG mailing list
Read this without the formatting.
                                                                                                    

 

Hosted by HEAnet


Maintained by the ILUG website team. The aim of Linux.ie is to support and help commercial and private users of Linux in Ireland. You can display ILUG news in your own webpages, read backend information to find out how. Networking services kindly provided by HEAnet, server kindly donated by Dell. Linux is a trademark of Linus Torvalds, used with permission. No penguins were harmed in the production or maintenance of this highly praised website. Looking for the Indian Linux Users' Group? Try here. If you've read all this and aren't a lawyer: you should be!
RSS Version
Powered by Dell