Changeset identity

[Aaron Bentley]

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

Russel Winder wrote:
> So the question is, what is the officially approved way of naming a
> changeset so that it may be applied from one branch to another.

Well, generally, just a -r spec.  I'm not sure I really understand the
question.

> Is push
> an acceptable technique here

Push will not work unless one project the project you're pushing into is
an ancestor of the project you're pushing from.  Even if it did, it
would probably reorder your log messages in ways you wouldn't like.


> or is merge and commit mandated?  The issue
> then is that the changeset already has a commit message

Bazaar doesn't have changesets.  It has revisions.

> and no new
> commit message is needed so any sequence that requires an explicit
> commit seems sub-optimal, indeed unnecessary.

When you merge, you're creating a new tree state that has never existed
before, and you may have to resolve conflicts and such.  Any lines you
have to change due to conflict resolution should be attributed to a
commit, and should have a message associated with them.

So yes, commit messages are required.

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

iD8DBQFIkA8F0F+nu1YWqI0RAp13AJ9E7znCINReHjWk0PLhGcJaj0HiVQCaA0DT
/g+9FmMSwwKGpAjZzrtpQ6s=
=868y
-----END PGP SIGNATURE-----