Just pulled a fresh copy. Looks good now. -- Roelof
On Tue, Mar 2, 2010 at 1:19 PM, Mauricio Scheffer < [email protected]> wrote: > Can't find those merges anywhere... can you tell me the SHA1s ? > Can you see them here? > http://github.com/castleproject/Castle.Components.TemplateEngine/commits/master > > On Mar 2, 2:37 am, Roelof Blom <[email protected]> wrote: > > Mauricio, noticed it and wanted to ask you. > > > > After your fixes I see the message 'Merge branch 'master' of > > github.com:castleproject/Castle.Components.TemplateEngine' > > twice in the log, one on March 1 and one on March 2. Is this ok? > > > > -- Roelof. > > > > On Tue, Mar 2, 2010 at 4:38 AM, Mauricio Scheffer < > > > > > > > > [email protected]> wrote: > > > There's something weird in the TemplateEngine repo. There is a merge > > > ( > > >http://github.com/castleproject/Castle.Components.TemplateEngine/comm. > .. > > > ) of two trees: one of them leads to the first commit (r1 of SVN) > > > while the other leads to r338 of SVN : > > > > >http://github.com/castleproject/Castle.Components.TemplateEngine/comm. > .. > > > > > If it's ok with everyone I'll rewrite the last couple of commits to > > > remove this merge, leaving only the tree that comes from r1. > > > > > Cheers, > > > Mauricio > > > > > -- > > > 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]<castle-project-devel%[email protected]><castle-project-devel%2Bun > [email protected]> > > > . > > > For more options, visit this group at > > >http://groups.google.com/group/castle-project-devel?hl=en. > > -- > 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]<castle-project-devel%[email protected]> > . > For more options, visit this group at > http://groups.google.com/group/castle-project-devel?hl=en. > > -- 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.
