On Feb 1, 2008 8:55 AM, Johannes Schindelin <[EMAIL PROTECTED]> wrote:
> Hi,
>
> On Fri, 1 Feb 2008, Johannes Schindelin wrote:
>
> > Completely forgot: Mike, would you mind me splitting your patches
> > installing libtool and swig, such that there is one commit for the
> > release.sh script and .gitignore, and the other for the actual
> > installation of the component?
> >
> > I think this would make cherry-picking and following history easier.
>
> Actually, I rethought this.  There are two good reasons to leave the
> history of work/git-svn as-is:
>
> - It is faithful.  I am not a president of a major nation state, so I do
>   not feel compelled to rewrite history.

It doesn't bother me either way.  It is a work branch (subject to
rewriting) and I should have committed the generated content separate
from the creation content.  If you'd rather, I can redo my commits.

>
>   It should also make it easier for other people to get inspiration,
>   should they get as stuck as we did many times.
>
> - I am a lazy bastard.
>
> So, unless there are objections, I want to create a new branch, "msys",
> from work/git-svn as-is.

ACK

>
> This allows us to go back to that branch at any time, should we need any
> other MSys program (or update one).
>
> Then I would scratch temp/msys, work/msys, and work/msysperl.

ACK

>
> As for work/msysfull, I'd like to push this onto "full".  Again, only if
> there are no objections.

ACK

>
> The next step is to get subversion+perl and Term::ReadKey onto "devel",
> weeding out what we do not need (and noting the original commit on the
> "msys" branch).
>
> Comments?

We could do this instead of or as well as rewriting history.  Like you
said, it's probably easier to just do this without rewriting history.

>
> Just a reminder: AFAIR we decided that
> - branches in the work/* namespace are subject to rebasing (or deletion),
> - branches in <yourname>/* should not be touched by anyone else but you, and
> - top-level branches are _never_ to be rebased, and additionally, they
>   should be only updated with at least one Ack by another team member.
>
> Ciao,
> Dscho
>
> P.S.: yes, that convention means that I fscked up: temp/msys was an error.
>

Mike

Reply via email to