Bug 189 - Merging incoming creation converts to outgoing creation (1GFKUF5)
Summary: Merging incoming creation converts to outgoing creation (1GFKUF5)
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Team (show other bugs)
Version: 2.0   Edit
Hardware: All Windows NT
: P3 normal (vote)
Target Milestone: 2.0 M4   Edit
Assignee: James Moody CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2001-10-10 21:37 EDT by John Arthorne CLA
Modified: 2016-07-06 17:38 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 John Arthorne CLA 2001-10-10 21:37:54 EDT
1) Start with a workbench containing a project that has an incoming creation
2) In the sync view, select the file that is an incoming creation
3) In the compare panes, select "Copy current change from right to left"
4) On the left hand side, right click, and choose save. 

Step 4 creates the resource, and converts from an incoming change to an outgoing change.
The problem is, it leaves the change marked as a creation, so it now shows up as an
outgoing creation, which is wrong.

Not a major bug, basically just means the icon annotating the file is wrong (has no lower
level effect).  Releasing the change works fine.

NOTES:

JohnA (6/19/2001 12:56:09 PM)
	Added to readme.
Comment 1 DJ Houghton CLA 2001-10-23 23:46:13 EDT
PRODUCT VERSION:

0.125

Comment 2 Jeff Brown CLA 2002-03-21 18:20:16 EST
For Team 2.0, step 4 causes the resource to be created with
an entry line like the following:
  /blah.txt/1.2/dummy timestamp//
The change kind changes from incoming addition to outgoing
change, though the compare viewer shows that the file contents
are the same.  So the icon annotation problem has gone away.

The entry line worries me.
Comment 3 Jeff Brown CLA 2002-03-22 14:40:10 EST
After step 4 we have a file with an entry line like this:
  /zzz.txt/1.1/dummy timestamp//

Doing an update works fine and results in an entry line like this:
  /zzz.txt/1.2/Result of merge//

Doing an update works fine and results in an entry line like this:
  /zzz.txt/1.3/Result of merge//

Committing it bumps the revisition and sets the timestamp correctly:
  /zzz.txt/1.4/Fri Mar 22 19:38:36 2002//

Also tried Replace With Latest and it works fine.
So no problems here as far as I can tell.
Comment 4 Kevin McGuire CLA 2002-03-22 17:10:18 EST
appears fixed
Comment 5 Eclipse Genie CLA 2016-06-27 18:19:01 EDT
GitHub Pull Request 196 created by [kcallin]
https://github.com/eclipse/mosquitto/pull/196
Comment 6 Eclipse Genie CLA 2016-07-06 17:38:02 EDT
GitHub Pull Request 206 created by [kcallin]
https://github.com/eclipse/mosquitto/pull/206