[rfc] what is 'merge tracking' means?

[Matthieu Moy]

Alexander Belchenko <bialix at ukr.net> writes:

> My friend ask me recently is bzr has 'merge tracking'? He use svn and
> this term appear from their roadmap
> (http://subversion.tigris.org/roadmap.html). 

Keeping track of which revision merge which one.

Yes, bzr has it (a merge has several ancestors), and does clever use
of it for merging, i.e. you can just say "merge http://that/branch/",
you don't have to say which revision to take.

> I say that bzr is decentralised version control system, so with
> merge is all right (only cherrypicking is not implemented).

AFAIK, the correct statement would be "only cherrypicking works as
badly as with svn" ;-).

-- 
Matthieu