Community
Participate
Working Groups
I miss a functionality for a merge like: cvs update -j <myBranchTag>:yesterday -j <myBranchTag> helloWorld.java Use only deltas no older than timestamp.
No time for this in 3.0 but should investigate for 3.1.
It appears that this tag format can only be used with -j. This means that we cannot make use of it from the merge wizard. When merging, we use "cvs -n update -r tag) to determine the trees involved and display the results to the user in the synchronize view. Since the tag format "<myBranchTag>:yesterday" does not work with -r, we cannot intergrate it into the merge wizard. The options that remains are: 1) Investigate changing the merge wizard to use -j when building the sync view contents. This would be a lot of work so unless there was a huge gain it probably won't happen. 2) Let the user specify the use of -j from a simpler update wizard and support the use of this tag format (see bug 65420 for a request to add merging to the update wizard).
Not for 3.1
There is currently no plan to address this item but patches will be accepted.
As of now 'LATER' and 'REMIND' resolutions are no longer supported. Please reopen this bug if it is still valid for you.