Bazaar Git Plugin

Merge lp:~gz/bzr-git/trivial_force_option_help into lp:bzr-git

  1. trivial_force_option_help
  2. Merge into trunk
Proposed by Martin Packman
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 1468
Merged at revision: 1468
Proposed branch: lp:~gz/bzr-git/trivial_force_option_help
Merge into: lp:bzr-git
Diff against target: 14 lines (+3/-1)
1 file modified
commands.py (+3/-1)
To merge this branch: bzr merge lp:~gz/bzr-git/trivial_force_option_help
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+82153@code.launchpad.net

Description of the change

Adds help for the --force switch to `bzr git-patch` so it's clear what's being forced.

Also removes reliance on old global option so it can be removed from bzr:

<https://code.launchpad.net/~gz/bzr/trivial_remove_unused_global_options/+merge/82152>

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'commands.py'
2--- commands.py 2011-11-04 17:20:09 +0000
3+++ commands.py 2011-11-14 14:36:37 +0000
4@@ -245,7 +245,9 @@
5
6 takes_options = [
7 Option('signoff', short_name='s', help='Add a Signed-off-by line.'),
8- 'force']
9+ Option('force',
10+ help='Apply patches even if tree has uncommitted changes.')
11+ ]
12 takes_args = ["patches*"]
13
14 def _apply_patch(self, wt, f, signoff):

Subscribers

People subscribed via source and target branches

to all changes: