Re: [CASHeW-s] Re: References added....not posted on CVS...

[Andrew John Hughes]

On Thu, 2004-12-16 at 12:09, Ravish Bhagdev wrote:
> Yes, the mentioned changes solve the problem...
> 
> But I cant even commit now.  Its showing some conflicts.  I dont have "diff" 
> installed on cygwin.  This is a real pain.  I WILL have to install linux to 
> do some work done.  I can be installing each and every utility one by 
> one....
> 
> - Ravish.
> ----- Original Message ----- 
> From: "Andrew John Hughes" <address@hidden>
> To: "CASHeW-s Main Discussion List" <address@hidden>
> Sent: Thursday, December 16, 2004 9:58 AM
> Subject: [CASHeW-s] Re: References added....not posted on CVS...
> 
> 
> > _______________________________________________
> > CASHeW-s mailing list
> > address@hidden
> > http://lists.nongnu.org/mailman/listinfo/cashew-s
> > 

Yes, as you may have picked up if you read my minutes from yesterday,
the Cygwin environment doesn't appear to be particularly useful for any
serious work.  It took us ages just to alter the Bash profile to get a
working environment.

Using a true GNU/Linux environment would really be your best option.  If
you do choose to do so, then I will support you in doing so (and no
doubt Simon will also help too).  If you don't want to permanently
install it on your machine just yet, you may want to look at a solution
like Morphix (www.morphix.org).  You can stick the CD in, do the work
you need to do, and your machine will be left unchanged when you've
finished (although you'll probably find it gets tedious making sure
everything is setup and ready to go each time).

As to conflicts, please see my CVS tutorial,

https://www.dcs.shef.ac.uk/wiki/bin/view/Darwin/DarwinFourCVS

which covers this under 'Daily CVS Use'.  Please -- NEVER COMMIT WITHOUT
RESOLVING CONFLICTS.  An unresolvable conflict is one which results in
the 'C' on update, and you will need to edit the file to merge the two
conflicting versions.  These are denoted as lines marked by <<<<< and
>>>>> (so you can do a Ctrl-S search through the file for those).  Once
corrected, please commit.  When committing, please make sure you include
the author's name in the log message which may be different from the
committer.   For example, I tend to use this style for my messages:

2004-12-16  Andrew John Hughes  <address@hidden>

   * proposal.tex
   Added grammatical changes.

You can find more on this in the Changelogs section of my teamworking
tips:

https://www.dcs.shef.ac.uk/wiki/bin/view/Darwin/DarwinFourTeamworkingTips#Changelogs

-- 
Andrew :-)

Please avoid sending me Microsoft Office (e.g. Word, PowerPoint) attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html

No software patents in Europe -- http://nosoftwarepatents.com

"Value your freedom, or you will lose it, teaches history.
`Don't bother us with politics' respond those who don't want to learn."
-- Richard Stallman

"We've all been part of the biggest beta test the world has ever known --
Windows"
-- Victor Wheatman, Gartner

signature.asc
Description: This is a digitally signed message part