blob: ecf0bad08ffe1171bddfe103537cb1260e45434c (
plain)
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
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
=== 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.
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 ) > ../$pfile.full
mkdir -p debian/patches
filterdiff --exclude "*/ChangeLog" < ../$pfile.full > debian/patches/$pfile
echo "$pfile" >> debian/patches/series
quilt push
quilt refresh
files="$(quilt files ${pfile}) debian/patches/series debian/patches/${pfile}"
files="$files .pc/${pfile} .pc/applied-patches"
bzr add $files
# now add an entry
dch --append "${pfile} (sync to $e)"
dch --edit # improve the entry
debcommit $files
../$pfile.full will have the full diff. See 'ChangeLog' entries there
and debian/patches/$pfile for help writing debian/changelog entry
You can set 'e' (end) to not go to tip.
== Cherry pick single patch ==
There is a utility in debian/cherry-pick-rev that will
help to cherry pick a single commit from trunk.
== New snapshot ==
To import a new snapshot, do:
trunk="../trunk"
uver=$(cd "$trunk" && ./tools/read-version) # the *next* upstream version
revno=$(cd "$trunk" && bzr revno)
pversion=$(dpkg-parsechangelog --show-field Version)
prevno=$(echo "$pversion" | sed 's,.*bzr\([0-9]\+\)-.*,\1,')
version=${uver}~bzr${revno}
tarball=cloud-init-${version}.tar.gz
bzr export --format=tgz --revision=${revno} "$tarball" "${trunk}"
t=../cloud-init_${version}.orig.tar.gz && [ -f $t ] && tarball=$t
[ -f "$t" ] || bzr export --format=tgz --revision=${revno} "$tarball" "${trunk}"
bzr merge-upstream "$tarball" --version=${version}
( cd "$trunk" && bzr log -r $(($prevno+1)).. ) > new-changes.log
|
