[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Emacs trunk

From: Stefan Monnier
Subject: Re: Emacs trunk
Date: Fri, 03 Dec 2010 17:50:38 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

>> He also gave them different file-ids.  So we should re-remove them and
>> then re-add them with "bzr add --file-ids-from" some older branch.
>> Or maybe just with something like "bzr merge -r 102572..102571".
> Plain old `bzr revert -r LAST-GOOD-REV configure.in' _seems_ to work...

Could be that it works as well, but "bzr merge -r 102572..102571" is the
standard way to undo a commit (and before committing this undo, you can
of course edit as much as you want so as to only undo part of the
commit, or add new changes on top of the undo, ...).  And it will show
you conflicts so you know where you need to check that you're not
accidentally undoing more than expected.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]