ERROR: These branches have diverged.

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Sam Steingold wrote:
> I am stuck again.
> what I want is a cvs-like approach: I want to have the most recent
> version of the source tree, occasionally submitting a patch. "cvs up"
> will mark the locally patched files with "M" until my patch is committed
> by a maintainer (after which "cvs up" becomes silent again).
> 
> what happened is that I submitted a patch and committed it locally (why
> did I do it? dunno - maybe to quiet some other warning?) and now I don't
> know what to do to get in sync with the master repository again.

We support a CVS-like approach, but committing locally defeats an
approach like that.

If you want to take a CVS-like approach, then don't commit locally, and
pull will work just fine.

Or to be even closer to CVS, do
$ bzr checkout http://bzr.xsteve.at/dvc/
# hack hack
$ bzr status
 M  foo
$ bzr update
$ bzr status
 M foo

By committing your local changes, you're creating a new line of
development.  When you have your own line of development, you must to
"bzr merge" to apply changes from http://bzr.xsteve.at/dvc/, and "bzr
commit" after you have reviewed/tested the changes.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGB+010F+nu1YWqI0RAqHWAJ4vR9rI1suWpb3xREyeTNn0HH5aLwCfRq3v
grNkbhcDzYGazNBVuCLO73M=
=2tGE
-----END PGP SIGNATURE-----