Re: Strange message from "bzr pull"

[Eli Zaretskii <eliz@gnu.org>]

> From: Karl Fogel <kfogel@red-bean.com>
> Cc: lekktu@gmail.com,  emacs-devel@gnu.org
> Date: Tue, 29 Dec 2009 14:09:43 -0500
> 
> >OK.  So, since we have this tree in trunk/, what are the reasons to
> >keep it pristine, again?  IOW, why not make quick and simple fixes in
> >it directly, instead of in another branch?
> 
> I *think* that would work fine (though I'm not 100% positive, since I
> don't do it myself).
> 
> The only reason I didn't document that is that if upstream gets new
> changes while the local edits are being made, then one would have to
> pull them in before committing -- because, as a bound branch, trunk is
> not supposed to diverge from what it's bound to.  But they might
> conflict.  Now your local trunk mirror is in a conflicted state.

Yes, understood.  But I didn't intend to make any serious changes
there, just the ``one-offs''.  If only one or two files are modified,
things will not become too ugly, I think, even if there are conflicts.

> So if you test it and it works, and no one thinks of any reason why it
> could lead to bad history, then... go for it, I'd say.

Will do, thanks.