always forcefully reset the bookmark that builds an association between 'default' and 'master'. Apparently I don't understand how bookmarks work, and in some cases pulling changes onto tip will not update a bookmark that points to it

This commit is contained in:
Lloyd Hilaiel 2010-08-27 15:05:27 -07:00
Родитель 62c889afdc
Коммит 8bdb75bdbb
1 изменённых файлов: 5 добавлений и 3 удалений

Просмотреть файл

@ -96,9 +96,11 @@ for repo in j['repos']:
# the directory doesn't exist! We should clone fresh
tryAndWhine("hg clone \"" + src + "\" \"" + tgt_dir + "\"", "Failed to clone from " + src)
os.chdir(tgt_dir)
# after clone, make a bookmark of default hg branch so master
# is created upon push to git
tryAndWhine("hg bookmark -r default master", "Failed to set master 'bookmark'")
# after clone, make a bookmark of default hg branch so master
# is created upon push to git
tryAndWhine("hg bookmark -f -r default master",
"Failed to set master 'bookmark'")
# now, does the repository exist on github? If not, create it
pushto = gh_user