1144860 - Firefoxtree causes 'hg pull --rebase' to give 'abort: source is ancestor of destination'

Status: RESOLVED WORKSFORME

(Developer Services :: Mercurial: firefoxtree, defect)

Description

[Botond Ballo [:botond]]

STR:
  1. Have the 'firefoxtree' extension enabled.
  2. Create an hg repository. Doesn't have to be related to Firefox.
  3. Create a local clone of it, and set the clone as the 'default'
     in the paths of the original.
  4. Create a commit in each.
  5. In the original repo, run 'hg pull --rebase'

Results:

botond@botond-desktop:~/temp/test-repo$ hg pull --rebase
pulling from /home/botond/temp/test-clone
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
pull obsolescence markers
0 obsolescence markers added
abort: source is ancestor of destination
botond@botond-desktop:~/temp/test-repo$

(and the rebase does not occur).

Disabling the 'firefoxtree' extension makes this problem go away.

My version-control-tools repo is up to date.

Comment 1

[Botond Ballo [:botond]]

Still happening with latest version-control-tools. I've been disabling firefoxtree because of this.

Comment 2

[Gregory Szorc [:gps]]

Weird.

I would recommend not doing `hg pull --rebase` as a workaround. `hg pull --rebase` == `hg pull` + `hg rebase`.

Comment 3

[Botond Ballo [:botond]]

I stopped seeing this about a month ago.

Comment 4

[Gregory Szorc [:gps]]

This was http://bz.selenic.com/show_bug.cgi?id=4633, which I fixed in Mercurial core after this or a similar bug report.