1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
=== General Info ===
Development packaging branch is at
lp:ubuntu/<suite>/cloud-init
alternatively, if you're on the development release:
lp:ubuntu/cloud-init
Patches in debian/patches are also stored applied in bzr.
However, the .pc directory is not version controlled.
When you've done a fresh checkout of above, you will need to run:
debian/rules quilt-setup
To cherry pick revisions 391 to tip from from trunk, do something like:
s=391; e=;
b=../trunk;
[ -n "${e}" ] || e=$(cd ${b} && bzr revno)
pfile=catchup-${s}${e:+-${e}}.patch
[ "$s" = "$e" ] && pfile=catchup-${s}.patch
( cd ../trunk && bzr log -r$s..$e &&
bzr diff -p1 -r$(($s-1))..$e ) > "debian/patches/$pfile"
echo "$pfile" >> debian/patches/series
quilt push
bzr add $(quilt files) debian/patches/${pfile} debian/patches/series
You can set 'e' (end) to not go to tip.
== New snapshot ==
To import a new snapshot, do:
uver="0.6.3" # this is the *next* upstream version
trunk="../trunk"
revno=$(cd "$trunk" && bzr revno)
version=${uver}~bzr${revno}
tarball=cloud-init-${version}.tar.gz
bzr export --format=tgz --revision=${revno} "$tarball" "${trunk}"
bzr merge-upstream "$tarball" --version=${version}
|