BzrTools

Merge lp:~james-w/bzrtools/strip-p into lp:bzrtools

  1. strip-p
  2. Merge into bzrtools.dev
Proposed by James Westby
Status: Merged
Approved by: Aaron Bentley
Approved revision: 724
Merged at revision: not available
Proposed branch: lp:~james-w/bzrtools/strip-p
Merge into: lp:bzrtools
Diff against target: 12 lines
1 file modified
command_classes.py (+1/-1)
To merge this branch: bzr merge lp:~james-w/bzrtools/strip-p
Reviewer Review Type Date Requested Status
Aaron Bentley Approve
Review via email: mp+12381@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Hi,

I always type "bzr patch -p1" and then have to correct it.
Please consider merging this so that no longer happens.

Thanks,

James

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

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

James Westby wrote:
> James Westby has proposed merging lp:~james-w/bzrtools/strip-p into lp:bzrtools.
>
> Requested reviews:
> Aaron Bentley (abentley)
>
>
> Hi,
>
> I always type "bzr patch -p1" and then have to correct it.
> Please consider merging this so that no longer happens.

 status approved

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

iEYEARECAAYFAkq+SX8ACgkQ0F+nu1YWqI18swCdHY/UzO2upQYiBjI1bEMjoClj
auIAn3Cl6vdNJjDtWG6HmYfC4qK2yrV8
=/oFW
-----END PGP SIGNATURE-----

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

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

Aaron Bentley wrote:
>> I always type "bzr patch -p1" and then have to correct it.
>> Please consider merging this so that no longer happens.
>
> status approved

Please try to stick to 79-character lines, though.

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

iEYEARECAAYFAkq+SjgACgkQ0F+nu1YWqI2PxwCfX81D+jRnd1SCCOcHKyvbTAhK
jPcAn1c85CFMERtZgsx+qhhe5lHiotJF
=oDKw
-----END PGP SIGNATURE-----

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'command_classes.py'
2--- command_classes.py 2009-06-11 23:40:26 +0000
3+++ command_classes.py 2009-09-24 20:30:21 +0000
4@@ -130,7 +130,7 @@
5 """Apply a named patch to the current tree.
6 """
7 takes_args = ['filename?']
8- takes_options = [Option('strip', type=int, help=strip_help),
9+ takes_options = [Option('strip', type=int, short_name='p', help=strip_help),
10 Option('silent', help='Suppress chatter.')]
11 def run(self, filename=None, strip=None, silent=False):
12 from patch import patch

Subscribers

People subscribed via source and target branches