TVT Merge policy

Date view Thread view Subject view Author view

From: Parmelan, Edouard (EP510777@exchange.FRANCE.NCR.com)
Date: Mon Dec 14 1998 - 10:02:49 EST

Hi,

On September 8, Archie does the following patch for FilterInputStream.java:
- read(byte[] b) should call read(b, 0, b.length), not in.read(b, 0,
b.length)

TVT merge of December 8 kill this patch.
Now, BufferedInputStream is again broken :(

First, programming question:
----------------------------

How handle read(), read(byte[]) and read(byte[], int, int) in all
InputStream
and InputReader subclasses, witch method should be safely overwritten ?
Is BufferedInputStream should implement read(byte[]) ?

As FilterInputStream extends InputStream and read(byte[] b) in InputStream
calls read(b, 0, b.length), I simply comment out read(byte[]) method from
FilterInputStream. [patch follow]

Second, how better handle TVT Merge and CVS readonly ?
------------------------------------------------------

With last TVT Merge kill lot of already patched bugs.

TVT Merge should not kill these already patched bugs.
This could be done easily with branch managment of CVS.

1. Simple merge.
  Assume readonly tree is the reference.

  TVT merge should be done in a branch of readonly tree and then, this
  branch should be merged to the trunk.

  With this point of view, TVT don't have patched bug form readonly tree,
  but patched bugs are not killed.

  This is not a good issue for TVT tree.

2. Full sync of TVT and readonly trees:
  Assume TVT tree is the reference.

  Let's see the readonly tree as an external branch of TVT.

  All patched bugs in the readonly tree should be commited in the readonly
  branch of TVT (exported from readonly tree and imported in readonly
branch).

  Then, merge readonly branch to TVT trunk.

  Now, extract the new TVT trunk and import it in the TVT branch of the
  readonly tree.
  
  Merge it to the readonly trunk.

  Don't forget to put tags for last extracted release and last commited
  release.

3. Don't sync TVT and readonly trees, use the same CVS tree:
  Let's be readonly tree a REAL branch of TVT tree (or TVT a real branch of
  readonly tree).

  There are a usefull tool in cvs/contrib directory: cvs-acl. I have
rewrite
  it in C with some improvments (I forget witch one).

  
Last comment:
-------------

After a TVT Merge (or any other merge) wait some days before create a
beta release :-)

Any comments are welcome,
Edouard. 

---
Edouard.Parmelan@France.NCR.COM
 <<fis.patch>>

Date view Thread view Subject view Author view

This archive was generated by hypermail 2b29 : Sat Sep 23 2000 - 19:57:14 EDT