[Bug 5408] New: pull --rebase doesn't rebase if remote repo has @ bookmark

bugzilla at mercurial-scm.org bugzilla at mercurial-scm.org
Wed Oct 26 15:08:20 UTC 2016


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

            Bug ID: 5408
           Summary: pull --rebase doesn't rebase if remote repo has @
                    bookmark
           Product: Mercurial
           Version: 3.7
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: rebase
          Assignee: bugzilla at selenic.com
          Reporter: mads at kiilerich.com
                CC: mercurial-devel at selenic.com

at fac3a24be50e^ :

  $ hg init b1
  $ cd b1
  $ touch foo
  $ hg ci -qAm 0
  $ echo foo > foo
  $ hg ci -m 1
  $ hg bookmark @
  $ cd ..

  $ hg clone -q b1 -r 0 bc
  $ echo > bc/f
  $ hg -R bc ci -Aqm bc
  $ hg -R bc pull --rebase --config extensions.rebase=
  pulling from $TESTTMP/b1
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files (+1 heads)
  adding remote bookmark @
  rebasing 1:a5740bec8029 "bc"
  saved backup bundle to
$TESTTMP/bc/.hg/strip-backup/a5740bec8029-07baa905-backup.hg (glob)
  $ hg -R bc log -G --template '{rev}:{node|short} {parents} {branches}\n'
  @  2:57f7d8edf300
  |
  o  1:cdb5fbbe88e9
  |
  o  0:093f0fe4b6a9

but after fac3a24be50e "rebase: choose default destination the same way as 'hg
merge' (BC)" it gives "nothing to rebase". That seems like an unfortunate and
unintended BC.

This is for example seen when using pull --rebase from the offial hg repo (both
old and new location).

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list