On Wed, 08 Oct 2003 10:38:04 +0100 Keith Whitwell <[EMAIL PROTECTED]> wrote:
> Felix Kühling wrote: > > Hi, > > > > I have a working copy of the config-0-0-1-branch with the trunk merged > > in now. According to the CVS policy I would have to commit this to the > > branch. However, this would be a huge commit due to the intermediate > > merge from XFree86. cvs diff -uN outputs a 323074-lines patch (11 MB). I > > believe it would unnecessarily blow up the repository. It should be > > sufficient to merge the config branch to a trunk working-copy and commit > > the result to the trunk. That would be a much smaller commmit. > > What size is that patch? 2776 lines (93 KB) > > > I don't intend to change the CVS policy in this respect, just asking if > > it would be ok to make an exception in this case. > > There's nothing that says you have to merge a branch to the trunk. If you've > got a changeset that you want to apply to the trunk (ie a patch that applies > cleanly against the trunk), we can consider that in isolation, regardless of > whether it once related to a branch. > > I'd be interested to see the actual patch, in fact. It's attached. I made it on my notebook just now so I couldn't test it yet, but after my experience with merging the other way round I'm pretty confident that it works. > > Keith Felix ------------ __\|/__ ___ ___ ------------------------- Felix ___\_e -_/___/ __\___/ __\_____ You can do anything, Kühling (_____\Ä/____/ /_____/ /________) just not everything [EMAIL PROTECTED] \___/ \___/ U at the same time.
config2trunk.diff.gz
Description: Binary data
