[Adium-devl] Version control

[Colin Barrett]

On Oct 8, 2007, at 8:27 PM, Augie Fackler wrote:

> If you're using DVCS, you don't want to rebase:
> http://changelog.complete.org/posts/586-Rebase-Considered-Harmful.html
> Executive summary: you change the history, which *really* hurts  
> people pulling from your repository.

You misunderstand.

By "rebase" I mean make branch foo contain all of the changes in  
branch bar, but *not* be branch bar. In a diagram of a DAG, it would  
look like

  start
    o
  /     \
o     o
|       |
o    /o <= 3
|   /   |
o/    o
|       |
a     b

Warning, probably will look awful in a monospaced font.

Do you see what I mean? I want to do a repeated merge from trunk into  
my feature branch, so I can integrate new patches to that file as they  
come in -- some of them are fixes I wrote on other branches to solve  
problems (I pushed them upstream and am getting them coming in from  
there), some of them are unrelated changes I want to merge in before  
pushing upstream.

As far as I can tell, hg does not handle this well. This hurts hard  
when you have a branch that you leave alone but want to come back to,  
and this is happening multiple times in one repository.

-Colin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20071008/e65838cb/attachment-0001.html>