Re: base

[Uday S Reddy]

Eli Zaretskii wrote:

> The bzr docs include a section on rebasing as well:
>
>   http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/adv_merging.html
>
> (look near the end).

Indeed, the last paragraph explains the attitude of Bazaar developers:

  Note: Some _users coming from central VCS tools_ with poor merge tracking
  like rebasing because it’s similar to how they are use to working in older
  tools, or because _“perfectly clean” history seems important_. Before
  rebasing in Bazaar, think about whether a normal merge is a better choice.
  [Emphasis added]

I don't have any trouble with the next sentence:

  In particular, rebasing a private branch before sharing it is OK but rebasing
  after sharing a branch with someone else is strongly discouraged.


Here is Linus Torlvalds explaining this point in more detail:

  http://www.mail-archive.com/address@hidden/msg39091.html

Cheers,
Uday