Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 62685

Summary:	[Wizards] Define a tag "<myBranchTag>:yesterday" for merge/update
Product:	[Eclipse Project] Platform	Reporter:	jens <jens.bensing.ext>
Component:	CVS	Assignee:	platform-cvs-inbox <platform-cvs-inbox>
Status:	RESOLVED WONTFIX	QA Contact:
Severity:	enhancement
Priority:	P3	Keywords:	helpwanted
Version:	3.0
Target Milestone:	---
Hardware:	All
OS:	All
Whiteboard:
Bug Depends on:	65420
Bug Blocks:

Description jens

2004-05-18 12:10:00 EDT

I miss a functionality for a merge like:
cvs update -j <myBranchTag>:yesterday -j <myBranchTag> helloWorld.java

Use only deltas no older than timestamp.

Comment 1 Michael Valenta

2004-05-18 13:22:12 EDT

No time for this in 3.0 but should investigate for 3.1.

Comment 2 Michael Valenta

2004-09-15 16:46:45 EDT

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).

Comment 3 Michael Valenta

2004-12-16 13:33:44 EST

Not for 3.1

Comment 4 Michael Valenta

2006-06-15 22:50:12 EDT

There is currently no plan to address this item but patches will be accepted.

Comment 5 Denis Roy

2009-08-30 02:15:47 EDT

As of now 'LATER' and 'REMIND' resolutions are no longer supported.
Please reopen this bug if it is still valid for you.