Re: SVN layout
On Thu, Aug 25, 2005 at 10:32:59AM +0200, Bastian Blank wrote:
> On Thu, Aug 25, 2005 at 04:49:59PM +0900, Horms wrote:
> > 1. Should linux-2.6 go in trunk/kernel/ or just trunk.
> > Given that we no longer need source and per-arch directories,
> > it seems logical to just move it up to trunk/
>
> linux-nonfree-2.6 and linux-patch-2.6.12-mips are missing from your
> list and we can move anything directly into trunk with this rationale.
Sorry, I missed them. In my mind, the idea of a deeper structure
makes sense if there are a bunch of things that need to be grouped
togehter, or if trunk/ gets too messy. If 2.6 is linux-2.6 +
linux-patch-2.6.12-mips + linux-nonfree-2.6, then trunk/kernel/
is probably a better place than trunk/
On a slightly tangential note, why do we have linux-patch-2.6.12-mips,
when all other archtectues just have linux-2.6?
> > a) They are both being developled, so we may as well have them in
> > trunk as linux-2.6 and linux-2.6-experimental, or something like
> > that. We always had multiple versions in trunk in the past,
> > and no one complained.
>
> Depends on what you mean with "developed". We saw that it is not
> possible to get regular testbuilds of the repository version and I broke
> 3 uploads because of this. If we want to be able to regulary push
> working versions into testing, we can't just push unchecked changes into
> this tree. This means that the sid tree can't be the development tree.
The packaging is new, so of course there are going to be problems,
hopefully that will stabalise over the next few weeks.
A linux-2.6 tree that is targeted for sid, where we make cautious
changes and a linux-2.6-experimental tree we we work on somethig greener
that is targeted for sid in the future, would seem to resolve this
problem, So would as putting stuff in branch/
Actually, appart from where the directories are, its exactly the same.
So we may as well put the directires somewhere that makes peoples
lives easier, thus this conversation.
> > b) Everything must come off trunk.
>
> What do you want to say?
I would like to say that trunk is a drirectory, and that all
directores in svn are created equal.
> > svk may be different, if so,
> > this is a excellent time to discuss that.
>
> It just gets crazy if it can't find merge points.
Could you elaborate a little. I think you are the only one using
svk at this point. So perhaps you are seeing problems that aren't
apparent when svn is used.
When you say merge point? Does svk dictate that your head is
in trunk/ and directories in branch/ are siblings of it?
Or is it just a matter of knowing where each tree is in
the overall hierachy.
--
Horms
Reply to: