https://bz.mercurial-scm.org/show_bug.cgi?id=6966

            Bug ID: 6966
           Summary: hg pull --update updates only if it pulled changes
           Product: Mercurial
           Version: 6.8.1
          Hardware: PC
                OS: NetBSD
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: Mercurial
          Assignee: bugzi...@mercurial-scm.org
          Reporter: mercurial-bugzi...@campbell.mumble.net
                CC: mercurial-de...@mercurial-scm.org
    Python Version: ---

I expected that

hg pull -b <branch> --update

would be equivalent to

hg pull -b <branch>
hg update <branch>

in that it pulls any changes on the branch and then updates to the tip of the
branch.  But if no changes were pulled down, then `hg pull --update' _doesn't_
update to the tip of the branch while `hg pull && hg update' _does_.

Test case:


#!/usr/bin/env cram

Count reproducible time by increments:

  $ now=0
  $ tick() { now=$((now + 1)); }

Set up an initial hgrc for non-interactive use in this script:

  $ export HGRCPATH="$(pwd)/.hgrc"
  $ cat <<EOF >$HGRCPATH
  > [ui]
  > username = u...@example.com
  > interactive = no
  > quiet = yes
  > verbose = no
  > EOF

Start with an hg repository with a commit:

  $ hg init repo
  $ echo hello >repo/README
  $ tick; hg -R repo commit -d "$now 0" -Am 'first revision'
  $ ls repo
  README

Clone the repository with no checkout and verify there's nothing
checked out:

  $ hg clone -U repo clone
  $ ls clone

Pull the default branch with --update and verify there's still nothing:

  $ hg -R clone pull -b default --update
  $ ls clone
  $ hg -R clone parent

Add another commit upstream:

  $ echo world >>repo/README
  $ tick; hg -R repo commit -d "$now 0" -m 'second revision'

Pull the same way and now we're updated:

  $ hg -R clone pull -b default --update
  $ ls clone
  README
  $ hg -R clone parent
  1:42394640dac4

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to