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; } } }

Conflict Check

cemman01

We are trying to capture conflicts between files in a workarea and Staging, before the files get submitted to Staging.

Apart from iwconflict.cgi, is there any command (teamsite or perl) that can be used to check for conflicts before any action gets executed?

Find more posts tagged with

Comments

Migrateduser

If there are conflicts when you submit files, the submit will not execute. It has built-in conflict checking. Good luck trying to figure out how to resolve files that are in conflict, though.

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

cemman01

True, but our case is that if there are no conflicts we do not want the submit to continue. We would just like to know if there are conflicts and list them.

We already had tried out what you suggested.

james1

Yes, iwcmp will tell the nature of all differences between files in two areas, including conflicts.

-- James

--
James H Koh
Interwoven Engineering

mfritsky

How does iwcmp indicate a conflict? Does it give a particular return code, or some kind of output? From what I've seen with iwcmp, you would get output such as

f+ f abc.txt

when a file is modified in a workarea and compared to Staging. If the version in Staging is version 3 and the version in the workarea is 3+, everything is fine. However if the file in Staging is version 3 and the version in the workarea is 2+, there would be a conflict. Wouldn't iwcmp just return the same output for both of these cases?

james1

I believe that you should see "f+ f+ file/name/here" for a conflict.
-- James

--
James H Koh
Interwoven Engineering

Migrateduser

That is an undocumented "feature", is it not? Sure would be nice if things like this were in the documentation.

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

cemman01

Thanks for the information!

Migrateduser

I'll file a doc bug. Some of the CLTs didn't get documented well originally, and it turns out that is hard thing to do after the fact. Please file a doc bug via support if you come across items like this.
Regards,

lissa