On Tue, 2008-03-25 at 13:04 +0100, Henrik Nordstrom wrote: > On Tue, 2008-03-25 at 12:04 +1100, Robert Collins wrote: > > > 'bzr revert' changes the working tree to be the same as a given revision > > [with optional file list]. > > If you then do a commit - e.g: > > bzr revert -r X > > bzr commit > > 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. > > How does revert differ from a backout merge down to that same revision? > > bzr revert -r X > > bzr merge -r -1..X (or last:..X)
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' -Rob -- GPG key available at: <http://www.robertcollins.net/keys.txt>.
signature.asc
Description: This is a digitally signed message part
