TemplateEngine repository anomaly

[Mauricio Scheffer]

There's something weird in the TemplateEngine repo. There is a merge
( http://github.com/castleproject/Castle.Components.TemplateEngine/commit/127963fa7aaebd4c32a4448164ceb9883b60475e
) 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/commit/1ce264313d5557beb1dc9015ccbe49e3171a8d81

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

[John Simons]

Mauricio, go ahead (have no idea what you are talking about but it sounds right :) )

Cheers
John

---

From: Mauricio Scheffer <mauricio...@gmail.com>
To: Castle Project Development List <castle-pro...@googlegroups.com>
Sent: Tue, 2 March, 2010 2:38:40 PM
Subject: TemplateEngine repository anomaly

--
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 castle-pro...@googlegroups.com.
To unsubscribe from this group, send email to castle-project-devel+unsub...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/castle-project-devel?hl=en.

 

[John Simons]

Btw,

Is there any way to get rid of "forked from mausch/Castle.Facilities.ActiveRecordIntegration" on all projects?
eg http://github.com/castleproject/Castle.Facilities.ActiveRecordIntegration

Cheers
John

---

From: Mauricio Scheffer <mauricio...@gmail.com>
To: Castle Project Development List <castle-pro...@googlegroups.com>
Sent: Tue, 2 March, 2010 2:38:40 PM
Subject: TemplateEngine repository anomaly

[Mauricio Scheffer]

Done. I'll remove my repos later so it doesn't show up as "forked from
mausch..."

--
Mauricio

On Mar 2, 12:42 am, John Simons <johnsimons...@yahoo.com.au> wrote:
> Mauricio, go ahead (have no idea what you are talking about but it sounds right :) )
>
> Cheers
> John
>
> ________________________________

> From: Mauricio Scheffer <mauricioschef...@gmail.com>

> To: Castle Project Development List <castle-pro...@googlegroups.com>
> Sent: Tue, 2 March, 2010 2:38:40 PM
> Subject: TemplateEngine repository anomaly
>
> 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 castle-pro...@googlegroups.com.

> To unsubscribe from this group, send email to castle-project-d...@googlegroups.com.

[Roelof Blom]

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.

[Mauricio Scheffer]

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 <roelof.b...@gmail.com> 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 <
>
>
>
> mauricioschef...@gmail.com> 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 castle-pro...@googlegroups.com
> > .
> > To unsubscribe from this group, send email to

> > castle-project-d...@googlegroups.com<castle-project-devel%2Bun subs...@googlegroups.com>

[Roelof Blom]

Just pulled a fresh copy. Looks good now.

-- Roelof

To unsubscribe from this group, send email to castle-project-d...@googlegroups.com.