Updated tags support

[Aaron Bentley]

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

Robey Pointer wrote:

> * When pull/merging from another branch, the other branch's tags are 
> merged in.  For identical tag names, the other branch "wins".  

Let's say I
1. branch from A, producing B
2. change the definition of tag 'foo'
3. merge from A

This would cause B's 'foo' to revert to its old meaning and become the
same as A's 'foo'.  I think this would be surprising and confusing.

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

iD8DBQFDtDF90F+nu1YWqI0RApj8AJ46ujoC9fPaJNcI80YmcwhpOoYSDQCfTql7
zTLJJMVBglAa+6QQXHotBBA=
=xsvi
-----END PGP SIGNATURE-----