Retrospectively, I agree with Christoph's proposals and semantic, but I
also agree with Will that now that we have the
directive.set.null.allowed configuration property, the whole debate
seems deprecated. In the thext major Velocity version, this flag should
default to true.
But I found a bug in
What I suggest is to avoid merging since every important change has been
ported to 2.x.
So what I would do is:
$ svn mv -m create 1.x branch
https://svn.apache.org/repos/asf/velocity/tools/trunk
https://svn.apache.org/repos/asf/velocity/tools/branches/1.x
$ svn mv -m 2.x becomes trunk
now that 1.4 has been released and we're planning to end the 1.x
series, i would like to move the 2.x branch to become the trunk. this
should avoid confusion about what to make patches against and where
work is happening.
i, however, have had little experience with doing big merges like
this.
On Nov 28, 2007 10:57 AM, Claude Brisson [EMAIL PROTECTED] wrote:
What I suggest is to avoid merging since every important change has been
ported to 2.x.
true.
So what I would do is:
$ svn mv -m create 1.x branch
https://svn.apache.org/repos/asf/velocity/tools/trunk