Bug 244 - False conflicts when resources copied between streams (1GK7IBO)
Summary: False conflicts when resources copied between streams (1GK7IBO)
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Team (show other bugs)
Version: 2.0   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: 2.0 M4   Edit
Assignee: Kevin McGuire CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2001-10-10 21:38 EDT by Kevin McGuire CLA
Modified: 2017-09-29 14:16 EDT (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Kevin McGuire CLA 2001-10-10 21:38:49 EDT
Email from Philippe, additional email from Erich:

Both versions were made using in HEAD. v_0_135... was made by versioning from 
teamstream, and v_200 was made by versioning from workspace.
Should this make any difference ? Is the teamstream were a project is released 
affecting the compare behavior ?



	Erich Gamma
	09/17/2001 01:28 PM
		 
		 To: Kevin McGuire/OTT/OTI@OTI
		 cc: Philippe Mulet/SNZ/OTI@OTI
		 Subject: False Positives when catching up with STABLE

Kevin,
Philippe's and my team are now working with a STABLE team stream.
The complaint we are now getting is that catching up with STABLE is
slow. It feels like a full replace with version operation.

Here is what we are doing:
1)  Philippe releases to HEAD
2)  once he has  a stable version he versions and copies it to
 the STABLE stream.
3) Somone from ZRH catches with the STABLE stream
 ->there are many changes and catching up
 is slow. Many of them are false positives.
 Looking at the content changes with compare
 shows that there are no content changes.

Can you explain what is going on and why we are getting all these
false positives?

Some more experiments.
When I do a replace with stream contents followed by a catch-up
then I'm getting the correct result, i.e., no changes.

--erich



NOTES:

Jean-Michel (9/18/01 9:08:10 AM)

I understand the reason why they want this but the actual steps they take may 
be wrong. 

> So, since the project is being copied to another stream in the same repo, we 

should be able to just release those resources into that stream 
How do they do this? There should never be a release to the STABLE stream. How 
with Eclipse can Philippe release to HEAD then release again to STABLE? I'm 
pretty sure we don't support that. The only way to move changes from one stream 
to another is to merge. 

KM>They version the project in HEAD, then "Copy Version to Stream", copying 
that version to STABLE. This avoids trying to switch the sharing of the project 
to the other stream (which we don't handle well). 

Assume user A and B are accessing P1 in the same repo. 

1. User A works on his project P1 in HEAD. 

2. User B adds P1 from STABLE to his workspace. 

3. User A performs his usual development releasing and catching-up to P1 in 
HEAD. 

4. User A feels that P1 is stable, he ensures that all changes are released to 
HEAD, then versions his workspace then copies the version to the STABLE stream 
(a.k.a. Copy Version to Stream). 

5. User B catches-up to P1 in STABLE and will see the changes made since he 
last caught-up (basically the version that User A versioned from his 
workspace). 

6. User A continues working away in HEAD... 

This scenario works, assuming same repo, with Eclipse 1.0 without source 
compare functionality. 

KM>>Those are the steps I believe they are following. I've confirmed they are 
in the same repository. Are we sure we aren't growing extra revisions on the 
Copy Version to Stream?
Comment 1 DJ Houghton CLA 2001-10-23 23:48:37 EDT
PRODUCT VERSION:

1.0

Comment 2 Kevin McGuire CLA 2002-03-21 13:30:23 EST
Split/merge totally reworked, workflow different now.
Comment 3 Eclipse Genie CLA 2017-09-29 14:16:12 EDT
GitHub Pull Request 280 created by [cxbrooks]
https://github.com/eclipse/triquetrum/pull/280