Bazaar

Merge lp:~songofacandy/bzr/tbzr-refactoring into lp:bzr/2.0

  1. tbzr-refactoring
  2. Merge into 2.0
Proposed by methane
Status: Merged
Approved by: Andrew Bennetts
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~songofacandy/bzr/tbzr-refactoring
Merge into: lp:bzr/2.0
Diff against target: 0 lines
To merge this branch: bzr merge lp:~songofacandy/bzr/tbzr-refactoring
Reviewer Review Type Date Requested Status
Andrew Bennetts Approve
Ian Clatworthy Approve
Review via email: mp+12957@code.launchpad.net
To post a comment you must log in.
Revision history for this message
methane (songofacandy) wrote :

Old com built on Python is not used anymore.
I remove it from tortoisebzr.
This affects bzr's setup script.

Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

Looks ok to me.

review: Approve
Revision history for this message
Andrew Bennetts (spiv) wrote :

I'm always happy to see old code get deleted :)

review: Approve
Revision history for this message
Andrew Bennetts (spiv) 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.

Revision history for this message
methane (songofacandy) wrote :

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>

Revision history for this message
Robert Collins (lifeless) wrote :

perhaps an out of date public mirror? Get a sysadmin to poke...

Revision history for this message
methane (songofacandy) wrote :

I've merged from http://bazaar.launchpad.net/~bzr-pqm/bzr/2.0/changes

--
Naoki INADA <email address hidden>

Preview Diff

Empty

Subscribers

People subscribed via source and target branches