Advocacy vs. git

[Greg Ward]

On Fri, Apr 24, 2009 at 2:10 PM, Kevin Bullock
<kbullock+mercurial at ringworld.org> wrote:
> It's my contention that rebase is like goto: useful for the few cases where
> you need the raw power, dangerous when used for common cases. But I could be
> wrong. I've explored the rebase extension a bit, but haven't found a use for
> it yet.
> Do others use the rebase extension in daily work? What's the advantage?

We are thinking about migrating from CVS to Mercurial, and I have
tentatively proposed use of "hg pull --rebase" as the normal thing to
do when integrating from the nearest upstream repository.  (We're
planning a 2-stage hierarchy of repositories: pull from/push to your
team repository, then periodically your team pulls from/pushes to the
master repository.)  The main reason for this is to keep history more
linear.  Obviously there will still be merges, e.g. whenever the
higher level repositories are integrated.  But if the day-to-day work
of a single team looks linear, it might be easier to follow.

All pure speculation at this point, of course.  And biased by the fact
that we are all new to DVCS.

Greg