bzr-builder

Merge lp:~spiv/bzr-builder/merge-subdirs-479705 into lp:bzr-builder

  1. merge-subdirs-479705
  2. Merge into trunk
Proposed by Andrew Bennetts
Status: Merged
Merged at revision: 100
Proposed branch: lp:~spiv/bzr-builder/merge-subdirs-479705
Merge into: lp:bzr-builder
Diff against target: 19 lines (+3/-3)
1 file modified
__init__.py (+3/-3)
To merge this branch: bzr merge lp:~spiv/bzr-builder/merge-subdirs-479705
Reviewer Review Type Date Requested Status
James Westby Pending
Review via email: mp+32542@code.launchpad.net

Description of the change

This is just some minor tweaks to the plugin help relating to nest-part that I couldn't push last night because of the planned Launchpad downtime.

To post a comment you must log in.

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 2010-08-12 14:04:50 +0000
3+++ __init__.py 2010-08-13 01:22:40 +0000
4@@ -77,12 +77,12 @@
5
6 which specifies that the only the debian/ subdirectory should be merged. This
7 works even if the branches share no revision history. You can optionally
8-specify the revision and subdirectory in the target with a line like
9+specify the subdirectory and revision in the target with a line like
10
11 nest-part libfoo lp:libfoo src lib/foo tag:release-1.2
12
13-will put the "src" directory of libfoo in "lib/foo", using the revision of
14-libfoo tagged "release-1.2"
15+which will put the "src" directory of libfoo in "lib/foo", using the revision
16+of libfoo tagged "release-1.2".
17
18 It is also possible to run an arbitrary command at a particular point in the
19 construction process. For example::

Subscribers

People subscribed via source and target branches