Merge remote-tracking branch 'origin/master'

README.markdown

@@ -41,9 +41,9 @@ Push commits from git to a new qqueue in an hg repository.  If GIT\_REVS is
 omitted, push the commits `$(git merge-base HEAD $(git-tracks))..HEAD` (i.e.
 everything in the current branch that's not upstream).
 
-If `-t` or `--tip` is specified, update the hg repository to its tip before
-pushing.  Otherwise, update the hg repository to the revision atop which the
-git commits are based.
+If `-t` or `--tip` is specified, pull and update the hg repository to latest
+tip before pushing.  Otherwise, update the hg repository to the revision atop
+which the git commits are based.
 
 ## git-push-to-try
 

git-push-to-hg

@@ -117,6 +117,13 @@ hg_cmd qqueue patches
 hg_cmd qqueue -q --purge git-temp || true
 hg_cmd qqueue -q --create git-temp
 
+# If we passed --tip, do hg pull && hg up.  (This isn't the same as hg pull -u:
+# if there's nothing to pull, hg pull -u will skip the update!)
+if [[ "$push_to_tip" != 0 ]]; then
+  hg_cmd pull
+  hg_cmd up --check
+fi
+
 # Pass --quiet only for not-old-git.
 if [[ "$old_git" == 0 ]]; then
   git_format_quiet='--quiet'