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
77
77
6
78
which specifies that the only the debian/ subdirectory should be merged.  This
78
which specifies that the only the debian/ subdirectory should be merged.  This
7
79
works even if the branches share no revision history.  You can optionally
79
works even if the branches share no revision history.  You can optionally
9
80
specify the revision and subdirectory in the target with a line like
80
specify the subdirectory and revision in the target with a line like
10
81
81
11
82
  nest-part libfoo lp:libfoo src lib/foo tag:release-1.2
82
  nest-part libfoo lp:libfoo src lib/foo tag:release-1.2
12
83
83
15
84
will put the "src" directory of libfoo in "lib/foo", using the revision of
84
which will put the "src" directory of libfoo in "lib/foo", using the revision
16
85
libfoo tagged "release-1.2"
85
of libfoo tagged "release-1.2".
17
86
86
18
87
It is also possible to run an arbitrary command at a particular point in the
87
It is also possible to run an arbitrary command at a particular point in the
19
88
construction process. For example::
88
construction process. For example::
Reviewer	Review Type	Date Requested	Status
James Westby		2010-08-13	Pending
Review via email: mp+32542@code.launchpad.net
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	77		77
6	78	which specifies that the only the debian/ subdirectory should be merged. This	78	which specifies that the only the debian/ subdirectory should be merged. This
7	79	works even if the branches share no revision history. You can optionally	79	works even if the branches share no revision history. You can optionally
9	80	specify the revision and subdirectory in the target with a line like	80	specify the subdirectory and revision in the target with a line like
10	81		81
11	82	nest-part libfoo lp:libfoo src lib/foo tag:release-1.2	82	nest-part libfoo lp:libfoo src lib/foo tag:release-1.2
12	83		83
15	84	will put the "src" directory of libfoo in "lib/foo", using the revision of	84	which will put the "src" directory of libfoo in "lib/foo", using the revision
16	85	libfoo tagged "release-1.2"	85	of libfoo tagged "release-1.2".
17	86		86
18	87	It is also possible to run an arbitrary command at a particular point in the	87	It is also possible to run an arbitrary command at a particular point in the
19	88	construction process. For example::	88	construction process. For example::