how to revert update operation

[Adeodato Simó]

* Robert Collins [Thu, 20 Jul 2006 12:32:55 +1000]:

> On Thu, 2006-07-20 at 04:08 +0200, Adeodato Simó wrote:

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

> from ' Either unbind, update, or pass --local to commit.'

> to  '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.'

> Ok, lets look at it in more detail.

> We may or may not be able to use push. I think in fact, that if the
> branch is compatible - if we can use push - we should do a push, then
> the regular commit.
> (this needs a bug opened on it)

Right, hopefully well explained in http://launchpad.net/bugs/53493.

> So offering push is kindof beside the point :).

Not reaaally, since the same error is printed when doing "commit" on a
checkout, and there are no uncommited changes. This is explained at the
end of my previous mail (the "Point A" part). If that gets addressed,
then yes, offering push is besides the point. :) (Or if it _will_ be
addressed, I also accept that not introducing the push reference to
remove it later is better, yes.)

> The master branch isn't the parent branch - we should not use 'parent'
> to refer to it.  I think saying 'to commit to this shared branch' might
> work though. Expanding on the use of update is definately a good thing.
> So 'update and then commit' is good. If you wish to keep working
> offline, pass --local to commit.

> We should not offer --local, or push, if its a lightweight checkout
> we're working with rather than a heavyweight checkout. (because they
> dont apply there).

Oh, right, forgot about lightcheckouts. Is it reasonable to check for
that, and only add the second sentence for heavyweight checkouts?

Thanks,

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
A dream is an answer to a question that we don't know how to ask.