On Wed, Jun 2, 2010 at 8:41 PM, Jelmer Vernooij <email address hidden> wrote:
> This is correct behaviour. bzr-svn doesn't push merged revisions but
> only the mainline by default so when you pull down the repository later
> it can't fetch the merged revision and since it hasn't fetched them it
> can't display them.
I realize that there are some details that the rhs revisions have, but
is it not possible to show the [merge] commit when the rhs is a ghost
revision? The merge commit knows that it modified the file. The
issue here is that while it may be expected behavior from a technical
perspective, it's awfully confusing from a user standpoint. And you
may end up missing information when trying to discovery the history of
a problem.
> If you push the merged revisions to e.g. branches/foo in the repository
> it works fine afterwards. Alternatively you should be able to set
> push_merged_revisions = True
Yeah, I know that pushing the revisions up will prevent it from being
a ghost. Unfortunately, I can't guarantee that folks are going to
always do that. I tried push_merged_revisions in the past, but that
didn't seem to work (it pushed the revisions, but it still appeared to
be a ghost).
On Wed, Jun 2, 2010 at 8:41 PM, Jelmer Vernooij <email address hidden> wrote:
> This is correct behaviour. bzr-svn doesn't push merged revisions but
> only the mainline by default so when you pull down the repository later
> it can't fetch the merged revision and since it hasn't fetched them it
> can't display them.
I realize that there are some details that the rhs revisions have, but
is it not possible to show the [merge] commit when the rhs is a ghost
revision? The merge commit knows that it modified the file. The
issue here is that while it may be expected behavior from a technical
perspective, it's awfully confusing from a user standpoint. And you
may end up missing information when trying to discovery the history of
a problem.
> If you push the merged revisions to e.g. branches/foo in the repository revisions = True
> it works fine afterwards. Alternatively you should be able to set
> push_merged_
Yeah, I know that pushing the revisions up will prevent it from being revisions in the past, but that
a ghost. Unfortunately, I can't guarantee that folks are going to
always do that. I tried push_merged_
didn't seem to work (it pushed the revisions, but it still appeared to
be a ghost).
-John