graft problem

[mk-lists at email.de]

Hi,

just now I ran into a funny problem with graft.

I have been working an a feature branch "b_feature" for quite a while.
That feature branch is still not yet stable enough to be merged with default.

That is why I have grafted from that branch only individual changesets in the past.
Right now I wanted to do the same:
---
$ hg version
Mercurial Distributed SCM (version 2.3.1)
$ hg up -C default
$ hg graft 1060  # changeset on "b_feature"-branch
skipping ancestor revision 1060
$
---
but as you can see; it failed!!!

WHY did that happen? That changeset is definitely not included in default, but graft claims it is an ancestor.

Well, one has to mention that "b_feature" is an inactive branch because of a previously done graft (see 1091).

Still, I am surprised that hg won't let me graft changeset 1060 from earlier on in that branch…

Any ideas?

Greets,
Marko


@  changeset:   1097:0027fbad3e01
|  tag:         tip
|  user:        Marko at iMac
|  date:        Sat Oct 20 16:35:18 2012 +0200
|  description:
|  - introduce FetchTable() to avoid redundancy
|  - UPDATE modified column after initial INSERT
|  - clean up
|
o  changeset:   1092:13b5285307b1
|  user:        Marko at iMac
|  date:        Sat Oct 20 12:59:38 2012 +0200
|
o    changeset:   1091:acdc589dd37f
|\   parent:      1090:5ce513f605e2
| |  parent:      1089:f4d4387395f9
| |  user:        Marko at iMac
| |  date:        Sat Oct 20 12:57:59 2012 +0200
| |  description:
| |  - graft f4d4387395f9 from b_feature
| |
| |
| o    changeset:   1090:5ce513f605e2
| |\   parent:      1085:d4df88fcfe18
| | |  parent:      1088:124ab87dd7a5
| | |  user:        Marko at iMac
| | |  date:        Sat Oct 20 12:57:14 2012 +0200
| | |  description:
| | |  - graft 124ab87dd7a5 from b_feature
| | |
| | |
o---+  changeset:   1089:f4d4387395f9
  | |  branch:      b_feature
 / /   user:        Marko at iMac
| |    date:        Sat Oct 20 00:51:45 2012 +0200
| |
| |
| o  changeset:   1088:124ab87dd7a5
| |  branch:      b_feature
| |  parent:      1086:008fbf6cdb2c
| |  user:        Marko at iMac
| |  date:        Sat Oct 20 00:11:00 2012 +0200
| |
 .
 .
 .
| |
| o  changeset:   1060:2e63c07a6c8b
| |  branch:      b_feature
| |  user:        Marko @ OpenSUSE 11.4
| |  date:        Fri Oct 12 22:12:25 2012 +0200
 .
 .
 .
  ^---branch "b_feature"
^-----branch "default"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20121020/022eedae/attachment-0002.html>