bzr-pipeline

Merge lp://staging/~thumper/bzr-pipeline/alias-tweak into lp://staging/bzr-pipeline

  1. alias-tweak
  2. Merge into trunk
Proposed by Tim Penhey
Status: Merged
Approved by: Aaron Bentley
Approved revision: 135
Merged at revision: not available
Proposed branch: lp://staging/~thumper/bzr-pipeline/alias-tweak
Merge into: lp://staging/bzr-pipeline
Diff against target: 10 lines (+1/-1)
1 file modified
__init__.py (+1/-1)
To merge this branch: bzr merge lp://staging/~thumper/bzr-pipeline/alias-tweak
Reviewer Review Type Date Requested Status
Aaron Bentley Approve
Review via email: mp+14883@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

The suggested unpumped alias incorrectly refers to --theirs rather than --mine.

Revision history for this message
Aaron Bentley (abentley) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Thanks, taken.

 merge approved

Tim Penhey wrote:
> Tim Penhey has proposed merging lp:~thumper/bzr-pipeline/alias-tweak into lp:bzr-pipeline.
>
> Requested reviews:
> Aaron Bentley (abentley)
>
>
> The suggested unpumped alias incorrectly refers to --theirs rather than --mine.
>
>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAksDd/gACgkQ0F+nu1YWqI2WrQCePUPE0pWnNuCOONAVToWTN6XZ
wogAn2QYHlohdH844O6bYJzDmaHoxO5J
=wFLb
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '__init__.py'
2--- __init__.py 2009-10-20 21:24:57 +0000
3+++ __init__.py 2009-11-15 09:25:21 +0000
4@@ -81,7 +81,7 @@
5 psend = send -r ancestor::prev..
6
7 # Show commits which have not been pumped into the next pipe yet.
8-unpumped = missing --theirs :next
9+unpumped = missing --mine :next
10 """
11
12

Subscribers

People subscribed via source and target branches