how to revert update operation

[Adeodato Simó]

* Robert Collins [Thu, 20 Jul 2006 11:58:40 +1000]:

> On Thu, 2006-07-20 at 00:27 +0200, Adeodato Simó wrote:
> > rror(str(e) + "\n"
> > +                'To commit to parent use push, or update and then
> > commit if '
> > +                'the branches have diverged.\nYou can also unbind or
> > pass '
> > +                '--local to commit to continue working offline.')

> Id rather we didn't mention 'bind' in the help here. Its rather likely
> to -not- do what the user expects until its fixed. Its very magic at the
> moment - which I dont like.

Sure, that bit just came straight from the original help, so feel free
to s/unbind or//. O:-)

In any case, do you agree that it'd be helpful to make the suggested
change (or a similar one) to the error string?

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
Beauty, brains, availability, personality: pick any two.