Re: git versus CVS (versus bk)

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Oct 31, 2005, 20:28 UTC
Message-ID: <46a038f90510311228v50743158q80d79e963bd503ce@mail.gmail.com>
In-Reply-To: <20051031195010.GM11488@ca-server1.us.oracle.com>

On 11/1/05, Joel Becker <Joel.Becker@oracle.com> wrote:

>         Where do you stand on this?  Would you rather see the full
> history pulled?  Do you prefer the one-clean-patch approach?  If so, is
> there any way to get a cogito/git command for it (git-pull-as-one?)?

You can do a diff that spans all the commits and apply it with a new commit msg. With cogito:

   cg-diff -r from:to | patch -p1

With git you can also do it directly within the repo/index with

   git-read-tree -m from HEAD to

In practice, a new developer will often roll up commits to avoid sending a string of shameful patches and corrections on top -- I often do that ;-) . Developers with more "mana" will have published repos where Junio pulls directly from -- and they get merged with full history. Of course -- they don't have brown-paper-bag commits like I do...

Sounds like a reasonable, organic/dynamic way of doing it.

cheers,

martin