openoffice-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mathias Bauer <>
Subject Re: [Code] strategy for "child works spaces"
Date Sat, 19 Nov 2011 21:55:28 GMT
Am 19.11.2011 15:22, schrieb Pedro Giffuni:

> I think we could use a SVN branch as a buffer to integrate
> CWSs one by one; that way we don't interrupt current work
> and get to try the CWSs before the tree changes too much
> to make merging difficult.
> Creating branches is very easy and any committer can do it.
> Is there a way to get CWSs as diffs?

You mean the existing ones from hg?

We discussed that some weeks ago. I still prefer the conversion of a cws
in single diffs, each one representing a single commit. It seems to be
doable for most cws. For the ones we integrated, the diffs have been
applied to the trunk, there's nothing that prevents that they could be
applied to branches.


View raw message