Truth be told I was so scared about the merging stuff with subversion + tapestry I actually sat down and read the chapter on it. It still hasn't saved me from the once or twice incident where something screwy happened with a directory, like forgetting that subversion supports symbolic links or something. ...hehe
On 1/11/06, Howard Lewis Ship <[EMAIL PROTECTED]> wrote: > > Something was screwed up in Eclipse; I thought I was committing > changes to trunk (i.e. 4.1) but instead, I ended up committing all > over the 4.0 branch. I'm not sure how I managed this. My project > folder is connected to trunk, but my sub-folders are connected to the > 4.0 branch. > > Now I have to do a god-awful merge from the 4.0 branch back into trunk > and try again. > > We're probably going to have to rebuild a new 4.0 branch to account > for this ... we should be able to do so off of tag/release-4.0. > > I would suggest that nobody checks in ANYTHING until I straighten this > out. > > M*therF*cker! > > -- > Howard M. Lewis Ship > Independent J2EE / Open-Source Java Consultant > Creator, Jakarta Tapestry > Creator, Jakarta HiveMind > > Professional Tapestry training, mentoring, support > and project work. http://howardlewisship.com > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > >
