Re: bzr revert

On Wed, 2008-03-26 at 10:15 +1100, Robert Collins wrote:

> The conflict resolver for revert uses a big hammer to make the tree
> identical; in the case of local edits the merge above will conflict
> and
> keep your edit, the revert above will discard it.
>
> 'revert' is 'become'
> 'merge' is 'apply change'

I was more thinking of the resulting changeset and what you meant by
your statement above

   "you are committing a changeset that happens to alter previously done
   work, but bzr does not consider this a cherrypick or merge - the undo
                                                        will propogate."

I.e. how does a commit of the results of "bzr revert -r X" differ from a
commit of the results of "bzr merge -r -1..X"?

Regards
Henrik
Received on Wed Mar 26 2008 - 17:03:40 MDT