I am chill'n like a villon... got me some gin and juice and I am mighty fine.
As my note said, I had not finished reading email, and I did notice some subjects that indicated that CVS was happy... no problem there. I did still feel the need to express that I feel very strongly about properly merging to avoid losing work. Your words "... so I may kill commits that that have been done in that timespan" made it appear as if you were not going to merge... so I commented on it. Anyways, it is all good... no worries. --jason Quoting Bill Burke <[EMAIL PROTECTED]>: > Fucking chill! I merged then committed. Everything is fine. > > > -----Original Message----- > > From: [EMAIL PROTECTED] > > [mailto:[EMAIL PROTECTED]]On Behalf Of Jason > > Dillon > > Sent: Monday, April 29, 2002 3:28 AM > > To: Bill Burke > > Cc: Jboss-Dev > > Subject: Re: [JBoss-dev] CVS HEAD in danger > > > > > > WHAT!!!?? This is not cool... I am still early into reading 300+ > > messages for > > today... one of which I think you posted saying things are cool... BUT > > > > It is not cool to not update your workspace before committing. > > Marc has done > > this before and it just ends up in lost work... some of my > > work... minor and > > easy to fix, but a royal pain in the ass. We have a version > > control system to > > avoid problems like this. > > > > True CVS is crap when it comes to merging, but this can be minimized by > > disabling keyword subst and isolating your updates & checking for merge > > conflicts. > > > > Committing in a fashion where it losses potential fixes, enhancements or > > documentation is a very, very, very, VERY bad idea. > > > > Please don't... take the time and deal with the merges. Please. > > > > --jason > > > > > > Quoting Bill Burke <[EMAIL PROTECTED]>: > > > > > I'll be doing some major commits in a few hours. I haven't merged from > > > mainline in about 1.5 weeks so I may kill commits that have been done > in > > > that timespan. Sorry for the problems... > > > > > > Bill > > > > > > > > > _______________________________________________ > > > Jboss-development mailing list > > > [EMAIL PROTECTED] > > > https://lists.sourceforge.net/lists/listinfo/jboss-development > > > > > > > > > > > > > ------------------------------------------------- > > This mail sent through IMP: http://horde.org/imp/ > > > > _______________________________________________ > > Jboss-development mailing list > > [EMAIL PROTECTED] > > https://lists.sourceforge.net/lists/listinfo/jboss-development > ------------------------------------------------- This mail sent through IMP: http://horde.org/imp/ _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
