http://bugs.grommit.com/show_bug.cgi?id=397





------- Comment #2 from richlowe at richlowe.net  2007-12-11 20:28 PDT -------
In the case where we ask for the active list against the workspace
grandparent (list -p .../onnv-clone, say), we're calculating the
parenttip to be the most recent change on the current branch that is
in the parent.

Unfortunately, before the merge is committed, the being-merged change
from the parent is not seen as on the current branch, so we use the
one prior.

To take an example from onnv-scm:

If you do the onnv_80 merge (but do not commit it) then hg list -p
.../onnv-clone, we will pick onnv_79 as the parent tip, and show the
entire set of interim changes as outgoing.

We should be picking onnv_80, obviously.  I suspect we'll have to
special case for such occasions.


-- 
Configure bugmail: http://bugs.grommit.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.

Reply via email to