Equivalent to Mercurial's 'fetch'

[Ben Finney]

Aaron Bentley <aaron at aaronbentley.com> writes:

> Merge is good.  It's for situations where you have diverged.
> 
> Pull is good.  It's for situations where you are updating a mirror.

You're suggesting that pull should *not* be used for branches that
aren't mirrors?

For a given project, I often have a single "integration" branch and
numerous "feature" branches. Development is mostly done in the feature
branches, with changes being pulled back and forth between them, and
merges being done into the integration branch to apply feature branch
changes.

However, sometimes a feature branch has diverged from the branch I
want to update from, so a pull isn't possible and I do a merge
instead; this is more troublesome than a pull, so I prefer to avoid
it.

'bzr merge --pull' (of which I only became aware yesterday) sounds
ideally suited to this, hence my interest in why you think it's wrong.

It seems as though you're saying that my workflow is not recommended,
and that instead all those updates to feature branches should be done
with a merge every time.

-- 
 \        "There are only two ways to live your life. One is as though |
  `\          nothing is a miracle. The other is as if everything is." |
_o__)                                                 —Albert Einstein |
Ben Finney