BzrTools

Merge lp://qastaging/~lifeless/bzrtools/trunk into lp://qastaging/bzrtools

  1. trunk
  2. Merge into bzrtools.dev
Proposed by Robert Collins
Status: Rejected
Rejected by: Aaron Bentley
Proposed branch: lp://qastaging/~lifeless/bzrtools/trunk
Merge into: lp://qastaging/bzrtools
To merge this branch: bzr merge lp://qastaging/~lifeless/bzrtools/trunk
To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) wrote :

I'd like some kind of test for merge -i.

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

On Tue, 2008-07-08 at 07:28 +0000, Aaron Bentley wrote:
> I'd like some kind of test for merge -i.

Ok, I'll look at a smoke test of some form after GUADEC.

-Rob

--
GPG key available at: <http://www.robertcollins.net/keys.txt>.

Unmerged revisions

625. By Robert Collins

Merge trunk.

624. By Robert Collins

Teach shelve to create a merge --interactive.

Updating diff...

An updated diff will be available in a few minutes. Reload to see the changes.

Subscribers

People subscribed via source and target branches