nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

TS6.1: CCP: Merge?

Adam Stoller · 2004-05-06T15:35:09+00:00

Environment* TS6.1 - Solaris 8 server * MacOS 10.3.3 Client * Mozilla 1.6 * CCPro UI Objective* Create a conflict and perform a merge operation ScenarioI very carefully set things up so that I know all the files I want to merge and if I compare the contents of my second workarea - they do show up as conflicts - so far so…

Adam Stoller

Environment

TS6.1 - Solaris 8 server
MacOS 10.3.3 Client
Mozilla 1.6
CCPro UI

Objective

Create a conflict and perform a merge operation

Scenario

Anyone got any ideas?
Anyone tried merging in TS6.1 yet?

--fish
Senior Consultant, Quotient Inc.
http://www.quotient-inc.com

Find more posts tagged with

Comments

Adam Stoller

FYI - I just tried this on my W2K client machine using IE - and I get the exact same window - it looks like Merge isn't working at all in 6.1 ... guess it's time to log a call with support ...

--fish
Senior Consultant, Quotient Inc.
http://www.quotient-inc.com

iwovGraduate

Ok, heres my environment: TS 6.1; W2k SP4; IE 6.0

I modified the same file in a workarea without doing a getlatest so that I have a conflict.

From the CCPro interface, I use the checkbox to select this file (with I know has conflict), and click on "Compare" from the menu bar - or whatever its called. (Its just below the Content/Workflow tab: File/Edit/View/Actions......Compare/GetLatest/Import......)

This shows the file in conflict between my workarea and staging, listed side by side. In between, there is an icon something like "<=>", when you click that, you get the differences window where I can merge. I do see the bottom pane - "Merged Changes".

You might want to try resizing the window, etc. I can hide the bottom "Merge Changes" completely by dragging the horizontal bar separating it and the upper 3 panes.

Also, the tabs I see in the differences are:
Notice "Merge" instead of "Source", etc in bold.

+------+------+----+----------+
|Visual|Merge|Tags|Properties|
+------+------+----+----------+---------------------------------------+
| [Accept Recommended] [<Previous][Next>][<][Save] |
+--------------------+-+---------------------+-+--------------------+-+
| |^| |^| |^|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
..............................|\ ......................................
| |v| |v| |v|
+--------------------+-+---------------------+-+--------------------+-+
|<Accept New Change>|<Accept Other Change>|<Keep Original >|
+----------------------+-----------------------+----------------------+
| Merged Changes |
| |
| |
| |
| |
+----------------------+-----------------------+----------------------+

Edited by iwovGraduate on 05/06/04 09:38 AM (server time).

iwovGraduate

Also, I notice that I can either "Accept New Change" OR "Accept Other Change" OR "Keep Original". In other words, I can accept the change in my workarea OR the change from staging area but not both. That is really not a "Merge", is it ?

Migrateduser

On a side note...are you doing this from workflow or from just a straight submit? I was told that the Resolve Conflict screen from a workflow is supposed to be much better and tell you why it thinks there's a conflict when it finds one. Just wondering if it does do that.

Dave Smith
Sr. Software Engineer
Nike, Inc.
(503) 671-4238
DavidH.Smith@nike.com

iwovGraduate

"from workflow or from just a straight submit" -- Can you clarify whats the difference ?

"Submit" invokes a workflow. Theres no "Submit Direct" in 6.x.

Migrateduser

OK...so then does the Resolve Conflit window explain why it thinks there's a conflict?

Dave Smith
Sr. Software Engineer
Nike, Inc.
(503) 671-4238
DavidH.Smith@nike.com

iwovGraduate

Maybe I am not understanding what you are trying to point out.

I get the same resolve window whether I get it from a workflow task or invoke it directly from CCPro. It shows the differences in two versions - isn't that the "why" of the conflict you are refering to ?

Migrateduser

What I'm getting at is the old Resolve Conflict window would often occur during workflow and you open it up and it shows a list of files that are in conflict and perhaps a list of files that are not in conflict. Sometimes it doesn't list any files that are in conflict, which is rather bizarre. But it doesn't tell you why it thinks this list of files are in conflict. Many times I'll do a compare on a file it thinks is in conflict and there will be no differences. It's often baffling and severely frustrating. I asked a long time ago for more information to be added to the Resolve Conflict screen, as I think it is the worst UI on the planet. Not all conflicts are because the actual contents of the file are different - so it's not always clear why it thinks a file is in conflict, but it never told you. The underlying code that produced the conflict certainly knows why it thinks there was a conflict - why not tell us? I was told that in 6.x the Resolve Conflict window is improved in this area. I'm just looking to see if anyone has found this to be true.

Dave Smith
Sr. Software Engineer
Nike, Inc.
(503) 671-4238
DavidH.Smith@nike.com

nipper

>Sometimes it doesn't list any files that are in conflict, which is rather bizarre

One case I have seen for this is if you had a delay (approval, etc) then the submit task
kicks on when the repository is frozen. The task gets put into resolve conflict.

We use delays & this happens once in a while.

It also happens on deletes pretty often, for no good reason.

Andy

Migrateduser

It happens more often than I'd like for no obvious reason. For updatetasks it happens sometimes and gets stuck there with no way to get past the conflict no matter what you do. It's so irritating. All I want is a comment that tells me why the thing thinks the files in question are in conflict - is it a date thing? a code difference thing? a freak of nature thing?

Dave Smith
Sr. Software Engineer
Nike, Inc.
(503) 671-4238
DavidH.Smith@nike.com

Adam Stoller

Apparently, according to Support, I have run into a situation where I have differences but not conflicts (despite the fact that when I compare the second workarea to staging it shows the list of files in the Conflicts tab rather than in either of the Newer in ... tabs) - and the Merge/Diff utility is "smart" and doesn't display the merge functionality unless it detects conflicts in the 3-way diff that is performed.

I'm still arguing my case - as I believe I'm doing things reasonably here:

A month ago, take a cut of code from our 5.5.2 server and bring it over to our 6.1 server
Modify code to work in 6.1 environment, plus some other clean-up, etc.
Modify code in 5.5.2 enviornment to fix bugs, etc.
Prepare for getting a new cut of the 5.5.2 code by creating a new workarea and getting it in-sync with the current staging area
Take the new cut of the 5.5.2 code and determine which files changed and just copy those files into the new workarea (thus all becoming n+ versions)
Touch all the same files in my 6.1 workarea and submit them (thus bumping the current version number to make the 5.5.2 files out-of-sync)
go to my 5.5.2 upload workarea and compare to staging (get a list of files "in conflict")
Attempt to merge changes...

TeamSite obviously thinks the files are in conflict because it put them in the Conflicts section when compared rather than in the Newer in STAGING or Newer in workarea sections - but the Merge/Diff utility says "found N differences but no conflicts" and thus does not enable the Merge capability.

Smitty - I initially tried to do this directly from the Compare window without going through a workflow - and I think that if the above problem weren't happening, I'd have been able to do it by clicking on the little:+---+
| =>+
+<= + |
+---+icon. That only brought up the 3-way diff, so I tried to submit the file - got a conflict resolution window - and there I chose Actions > Merge Differences - but it also only provided a 3-way diff window.

Basically, right now Support is saying that this is working correctly - and I'm saying it isn't.... we'll see what happens.... In the meantime I'm copying all the files (both 5.5.2 and 6.1) to my local disk so that I can use (Emacs) Ediff to merge them - and then copy them all back again)

--fish
Senior Consultant, Quotient Inc.
http://www.quotient-inc.com

iwovGraduate

Ok, now I see what you are trying to say. Even with 6.1 I don't see it telling me if the conflict is because of the contents of the file, metadata, file properties, etc.

Maybe you want to followup from whoever you heard that its improved in 6.1 and/or conflict screen via workflows. And possibly let us know Smiley Happy

Migrateduser

Thanks I think I will definitely follow that one up. Seems like the simplest thing to do. I'm pretty disappointed about that. I'll reply to this thread if I find out anything.

Dave Smith
Sr. Software Engineer
Nike, Inc.
(503) 671-4238
DavidH.Smith@nike.com

msrich

Since the summer, have you heard anything further about IWOV's plans to make the merge utility better? Do you know if there are any open FR's?