[PATCH 0 of 8] Move bookmarks extension to core

[David Soria Parra]

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

On 17.01.2011 08:53, Alexander Solovyov wrote:
> On Sun, Jan 16, 2011 at 23:57,  <dsp at php.net> wrote:
>> 3. pull behavior changed
>> Instead of pulling a specific bookmark from a remote repository, hg pull
>> now pulls all remote bookmarks. I think that we consider bookmarks on a remote
>> repository always public as there is no notion of a private bookmark. It is also
>> closer to the behavior I like to have to support feature branches using
>> bookmarks. hg pull still pulls only a specific bookmark using the -B option.
> 
> But what if I have changed some bookmark, will pull move this bookmark to new
> location? This doesn't seem that desirable. Maybe we want to have specific
> notation for remote bookmarks right at this point? Like 'path/bookmarkname'.
> 
I want to introduce remote bookmarks as soon as possible. at the moment
there are 3 different situations in which bookmarks are moved or not.

if we find a remote bookmark with the same name that points to a
descendant of your local bookmark with that name, we will move the local
bookmark forward to this point. if it points to a point that is not an
descendant we warn you that this is a diverging bookmark and will not
touch it. if there is no remote bookmark with that name and if its the
current bookmark we will move it forward to the current branch tip.

I don't think that is a problem at all. usually once you decided to push
a bookmark you like to have this behaviour. I don't think name clashes
are often and in that case you will probably just rename your local
bookmark once and the problem goes away. it's unlikly that you have the
same bookmark name on remote and local with different meanings.

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

iQIcBAEBAgAGBQJNNANiAAoJEAT0aMuPE7Z1iXYP/iMaECNxDzLLraAx6DYRuUQV
qtPVcvGV0vVWOGGCL2x3vMezHtOztTAers1kFwIlSrYUI866uXf0Xt62wOwIZhGG
9ak0W6SZwJoIAQiZusX4T3iNACTgEJsVFIL1tkldFdQ/ESjJj420vjNOM1+FtFIf
bE/l9TKIzAzm83RQd1R4Tkf9KtkVBT68YkDeceq6Refy7nVw4af1XmH/RrjGoVrq
GWEwdUNR72AKZSG0Ys6dvDjJQ2iwtFxo/CcSZgTbcpW2y2gnV3BnZ/hX3FpBN/Y9
J7sJ9dlpqUT+2VphZPPdeTd5bBqBRIIdE6ZvJ71JS3T02Tf83xwqQ72NPWKnMx9k
LxAue51mHrWYYqUTdfeOZbMttovK/LFKII6nGkfrVTUpzv0+9OSCK0/c0lhlAFEX
GZ8Pwfvk9upxjwe8X9vEiFc21pC5gHu9iEVXD+Vn+iZnoF5PJLZcDt6kDiFOhhnI
9329z5xTVSrJN3yM3SKdFQCBvq7+4mKy9E75WXZ0LpziL9wYaoLdwFNPlp1Iq1YU
Wfn2KvScyVeseKEFfozYgXrKVVWRxrvUlIIg4IoxMrE4cmWfGDA2aBuXzMrZrD8Z
fqGXzUGShiBWsnTrl60BVVMDqJkza4On6MuRy3lc21BRpFFnc8iu5yRuFE1tAzF0
oIJxThREIrqOcig/jrCV
=LKjB
-----END PGP SIGNATURE-----