Re: [Launchpad-users] Translations branch keeps having status set to 'Merged'

["Michael B. Trausch" <mbt@xxxxxxxxxxxxxxx>]

On Thu, 30 Jul 2009, Christian Robottom Reis wrote:

> On Wed, Jul 29, 2009 at 09:46:12AM +0700, Jeroen Vermeulen wrote:
> > We've talked this over on IRC.  There were two separate issues:
> >
> > 1. When you branch off another branch, apparently your new branch has
> > its status set to "Merged."
> >
> > This probably makes sense in the initial state where the two branches
> > are identical; it basically says "this branch has no changes that you
> > won't find in its parent."  At any rate the state changed as soon as
> > Launchpad committed a translations snapshot to it.
>
> I don't think this is actually true; Tim explained to me that branches
> are only marked as Merged if the development focus branch is
> non-identical to it (and of course if it includes its revisions too).

Yes, that seems to be the case.  Basically:

 bzr branch lp:alltray lp:~mtrausch/alltray/new-branch

new-branch is created in the Development status.  Then:

 cd alltray/trunk
 ... edit ...
 bzr ci -m 'message'
 bzr push lp:alltray

new-branch is then in Merged status.

	--- Mike