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
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-dev] packages branches and revision numbers when submiting packages with mgarepo
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20packages%20branches%20and%20revision%0A%20numbers%09when%09submiting%20packages%20with%20mgarepo&In-Reply-To=%3C4D54AF4F.8000000%40iki.fi%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="002530.html">
<LINK REL="Next" HREF="002533.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-dev] packages branches and revision numbers when submiting packages with mgarepo</H1>
<B>Anssi Hannula</B>
<A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20packages%20branches%20and%20revision%0A%20numbers%09when%09submiting%20packages%20with%20mgarepo&In-Reply-To=%3C4D54AF4F.8000000%40iki.fi%3E"
TITLE="[Mageia-dev] packages branches and revision numbers when submiting packages with mgarepo">anssi.hannula at iki.fi
</A><BR>
<I>Fri Feb 11 04:38:55 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002530.html">[Mageia-dev] [Mageia-sysadm] [496] update version in Makefile
</A></li>
<LI>Next message: <A HREF="002533.html">[Mageia-dev] Caution about using src.rpm from mdv since today
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2531">[ date ]</a>
<a href="thread.html#2531">[ thread ]</a>
<a href="subject.html#2531">[ subject ]</a>
<a href="author.html#2531">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Sorry for the delay.
On 29.01.2011 16:30, nicolas vigier wrote:
><i> On Sat, 29 Jan 2011, Anssi Hannula wrote:
</I>><i>
</I>>><i>
</I>>><i> AFAICS the above branch scheme doesn't work well with changelog
</I>>><i> generation. As changelog is generated from [packagename]/releases, one
</I>>><i> of two things seems bound to happen:
</I>>><i>
</I>>><i> a) There is no [packagename]/releases under the branch, and the
</I>>><i> changelog gets messed up (all commits since initial package import in a
</I>>><i> single release entry), or
</I>>><i>
</I>>><i> b) One tries to keep [packagename]/releases to preserve sane changelog
</I>>><i> when branching, but this will fail as this SVN command is invalid, as
</I>>><i> one can't copy a directory into itself:
</I>>><i> svn cp /packages/cauldron/[packagename]
</I>>><i> /packages/cauldron/[packagename]/branches/[branchname]
</I>><i>
</I>><i> Good question. I have looked at how it is working now :
</I>><i> - it first looks at all svn logs from [packagename]/releases, and
</I>><i> extract infos from "%repsys markrelease" logs, which contains
</I>><i> infos about packages version, release, and relrevision.
</I>><i> - it use commit logs from [packagename]/current and groups them by
</I>><i> package releases using the infos from markrelease.
</I>><i>
</I>><i> So I think we can do this :
</I>><i> - We don't copy releases directory in branches, only SPECS and SOURCES
</I>><i> directories, we share the releases directory for current and branches.
</I>><i> - In "%repsys markrelease" commits, we include the branch name
</I>><i> - When generating logs for a branch package we only use markrelease
</I>><i> infos from that branch, and from current from before the first
</I>><i> markrelease for the branch
</I>><i> - When generating logs for current package, we ignore markrelease from
</I>><i> other branches
</I>><i>
</I>><i> Does it look ok ?
</I>
What if branches are moved / branched to other branches?
Also, that won't preserve the changelogs of branches when they are
merged back (not 100% sure if that is wanted, though).
--
Anssi Hannula
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002530.html">[Mageia-dev] [Mageia-sysadm] [496] update version in Makefile
</A></li>
<LI>Next message: <A HREF="002533.html">[Mageia-dev] Caution about using src.rpm from mdv since today
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2531">[ date ]</a>
<a href="thread.html#2531">[ thread ]</a>
<a href="subject.html#2531">[ subject ]</a>
<a href="author.html#2531">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev
mailing list</a><br>
</body></html>
|
