Rebasing

[bramcohen]

Rebasing is a controversial feature, with some people declaring it the greatest thing since sliced bread and others declaring it the spawn of the devil (okay I exaggerate, but you get the idea). I will now set the record straight by explaining The Truth

Comments

[elsmi]

FYI, I can't quite work out what you're proposing exactly (is this the classic CVS model? or are branches basically a mutable list parentage so you can "erase" old parents? or is the idea that you can swap out one branch for another with the same name?). And I probably have more than the median understanding of this stuff so this might mean you should clarify some :-). (Maybe a worked example?)

[bramcohen]

Each branch acts almost like a classic CVS model. You can even implement it by having a '.parent' file with a single line in it. The .parent file can be changed just like everything else, but there are very specific guidelines for modifying and merging when it's different, having to do with actually looking at the snapshot which it points to.

Did that clarify things any? It really is a very different way of thinking about the world.