Mercurial > hg
view contrib/plan9/proto @ 24353:3f6bf9f29e7b
bookmarks: prevent divergent bookmark from being updated unexpectedly
Before this patch, "@99" suffixed bookmark may be updated unexpectedly
by the bookmark value on the remote side at "hg pull", if all of "@1"
to "@99" suffixed bookmarks exist in the local repository, because
variable "n" still refers "@99" suffixed bookmark after the loop to
examine "@num" suffixes, even though it already exists in the local
repository.
This patch prevents divergent bookmark from being updated
unexpectedly, and shows warning message in such situation.
This patch uses original python script "seq.py" instead of "seq"
command to create sequence numbers in the test, because "seq" command
may not be available: it isn't defined in recent POSIX specification
(POSIX.1-2001 2013 Edition or XPG7)
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Tue, 17 Mar 2015 18:20:24 +0900 |
parents | cf137319c6cd |
children |
line wrap: on
line source
lib - sys sys mercurial - sys sys hgrc.d - sys sys 9diff.rc - sys sys factotum.rc - sys sys rc - sys sys bin - sys sys 9diff - sys sys hg - sys sys sys - sys sys lib - sys sys python - sys sys lib - sys sys python2.5 - sys sys site-packages - sys sys hgext - sys sys + - sys sys mercurial - sys sys + - sys sys mercurial-VERSION-py2.5.egg-info - sys sys src - sys sys cmd - sys sys hg - sys sys + - sys sys