<div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">> to prevent 4.2-isms slipping in. What I understand by trunk is a<br>> place where the common code is and branches specialize that. So thunar
<br>> can live in the trunk but 4.2 and 4.4 should merge from trunk and<br>> modify debian/ dirs accoridngly. there may not be many differences<br>> now but you never know :)<br><br>I don't really agree. I think you're thinking of a larger project.
<br>It's mostly unlikely that we'll port stuff between 4.3/4.2 branches if<br>we go this route.</blockquote><div><br>As I said there may not be many differences. So yes instead of merging it will<br>probably be just a manual copy paste since the files are few and small.
<br><br></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">> I assume svn copy branches/4.2.3 branches/4.2.4 or an equivalent<br>> command when starting the
4.2.4 cycle, at which point 4.2.3 is frozen.<br><br>Hmm, yeah I can see that this is a technical solution but prefer<br>trunk/4.2 copied to branches 4.2.4 or whatever.</blockquote><div><br></div>ok so the branches are actually tags here, you do not work on them.
<br></div><br>But yeah there's probably no need to be too pedantic if it's such a small project.<br><br>Jani<br>