So any new work is supposed to be based on master, right? Is it just the build systems that are different between the two branches, or are the c# code bases different as well? (I'll go investigate on that)
Regards Morten On Jul 20, 5:17 pm, "G. Richard Bellamy" <[email protected]> wrote: > Maxild, > > The most recent commit to 1-1-stable was by Roelof to make sure it > builds using NAnt. > > Master is the tip and uses msbuild. 1-1-stable is a branch at the point > where the build process changed. > > I've been doing C/C++ development, so I haven't had much need for the > Castle stack recently. However, I've got a clone with some changes that > have been waiting for my attention to be merged back into the main > branch. > > The reason there's some funkiness WRT the ancestry is that the repo was > moved from SVN to Git. > > Regards, > Richard > > On Tue, 2010-07-20 at 04:01 -0700, maxild wrote: > > Hi, > > > I just peeked at the source at github. I see two branches 'master' and > > '1-1-stable'. The are subtle differences between the two: For instance > > master uses msbuild and 1-1-stable uses nant. master is not actively > > developed, and some work has been done to 1-1-stable. The thing I > > don't get is that the two branches have no common ancestor commit? > > > What are the relation between the two branches? Where should I look > > (in the future) for any planned work for next release? > > > Regards > > Maxild > > -- You received this message because you are subscribed to the Google Groups "Castle Project Development List" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/castle-project-devel?hl=en.
