I did bzr merge lp:bzr/2.0 bzr commit bzr push lp:~songofacandy/bzr/tbzr-refactoring
Please try again. This fix may be required for building bzr-2.0.1 Windows Installer with TortoiseBZR 0.3.1.
On Thu, Oct 15, 2009 at 11:03 AM, Andrew Bennetts <email address hidden> wrote: > By the way, I tried to merge this into lp:bzr/2.0 via PQM and got: > > """ > merge http://bazaar.launchpad.net/~songofacandy/bzr/tbzr-refactoring http://bazaar.launchpad.net/~bzr-pqm/bzr/2.0 > Command failed! > All lines of log output: > Executing star-merge http://bazaar.launchpad.net/~songofacandy/bzr/tbzr-refactoring at Wed Oct 14 13:01:10 2009 > Nothing to merge. > """ > > Even though AFAICT <email address hidden> (the tip of tbzr-refactoring) is not merged into 2.0. I'm not sure what's going wrong there. > -- > https://code.edge.launchpad.net/~songofacandy/bzr/tbzr-refactoring/+merge/12957 > You are the owner of lp:~songofacandy/bzr/tbzr-refactoring. >
-- Naoki INADA <email address hidden>
« Back to merge proposal
I did
bzr merge lp:bzr/2.0
bzr commit
bzr push lp:~songofacandy/bzr/tbzr-refactoring
Please try again.
This fix may be required for building bzr-2.0.1 Windows Installer with
TortoiseBZR 0.3.1.
On Thu, Oct 15, 2009 at 11:03 AM, Andrew Bennetts bazaar. launchpad. net/~songofacan dy/bzr/ tbzr-refactorin g http:// bazaar. launchpad. net/~bzr- pqm/bzr/ 2.0 bazaar. launchpad. net/~songofacan dy/bzr/ tbzr-refactorin g at Wed Oct 14 13:01:10 2009 /code.edge. launchpad. net/~songofacan dy/bzr/ tbzr-refactorin g/+merge/ 12957
<email address hidden> wrote:
> By the way, I tried to merge this into lp:bzr/2.0 via PQM and got:
>
> """
> merge http://
> Command failed!
> All lines of log output:
> Executing star-merge http://
> Nothing to merge.
> """
>
> Even though AFAICT <email address hidden> (the tip of tbzr-refactoring) is not merged into 2.0. I'm not sure what's going wrong there.
> --
> https:/
> You are the owner of lp:~songofacandy/bzr/tbzr-refactoring.
>
--
Naoki INADA <email address hidden>