Manual Merge

Hi,

Is there any utility available in Teamsite for manual merging with two different version of files?

Regards,

Find more posts tagged with

Comments

Which version of TS?

In TS6 (what I'm looking at right now) there's an IWHOME/bin/iwmerge.ipl - which might do what you want. The UI in TS6 (CCPro) allows you to diff / merge files - but basically if you only provide two files, it will only show up as a 'diff' - you need to supply a common ancestor version in order for it to behave like a 'merge' tool.

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

artor

Hi,

I run the merge utility but in order to resolve conflicts and difference and found this utility(applet) is not quite handy
because it creates the new file after having merge with .orignal extension and it doesnt do any
thing in the original file not the other workarea. So then I copy the <filename>.original to the existing
file <filename>.txt etc and overwrites the content and then again submit to the staging area and from the
other workear i run the Get Latest that's how it works as for my understand,
Is there any other things related to this or some other process to merge document please let me know.

Regards,

Adam Stoller

Let's start over.

What version of TS? (including SPs)
What platform? (probably doesn't matter, but it's good practice to include this information)

What are you trying to do?
What steps are you using to try to do this? (try to be as explicit as possible - remember, we can't see what you're doing)

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

artor

Hi Ghoti,

I am on Solaris 5.8 and running CC 6.1 and just testing the merge utility for how beneficial this utility in case of TeamSie being a version control.

And just applying the case in article Technote 1518.

Regards,

Adam Stoller

I'm not looking at the technote - but if you want to go through the merge process - here's one way to do it:

Create two workareas (WA_A, WA_B)
Do a Get Latest in both workareas
Edit the same file in both workareas (note: don't try this with DCRs - just non-templated files)
Make different changes in both files
Submit the file in WA_A
Submit the file in WA_B - this should trigger a conflict situation, from the Conflict Resolution window you should be able to Merge the changes.

When you merge, a copy of the file you are merging is created with the .original extension - that's there for you to be able to go back to the un-merged version if need be, generally you ignore it and eventually remove it (they're usually automatically marked private, so they won't get submitted by default).

When you're merging, you should get a window with 4 panes in it.

+----------+----------+----------+
|          |          |          |
| Yours    | Staging  | Ancestor |
|          |          |          |
+----------+----------+----------+
|                                |
|                                |
|       MERGED VERSION           |
|                                |
+----------+----------+----------+

You can actually make additional edits in the MERGED VERSION portion during the merged process - so it's possible to combine parts of both copies instead of just being able to choose one or the other..

Does that help?
Are there additional questions?

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

nipper

Disclaimer:

I have not merged in 6.1

In 3.X, 4.X and 5.X when you merged, the merged content was placed in the file and the original content from
that WA was in foo.html.original

I would be surprised if that was an enhancement from IW, so I suggest checking again & the calling support,
cause it very well may be a bug.

Andy

Adam Stoller

I think we're saying the same thing - just differently, and as I re-read my post I can see where it would be confusing.

The result of the merge is "foo.html" (the merged file) and "foo.html.original" (the pre-merged file - for backup purposes)

I don't believe this changed since Merge was first introduced.

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

nipper

yes, I agree, but his first post said the new merged file went in foo.html.original

that is either a bug or pilot error

Andy

artor

hi ghoti

I followed your line of steps and one thing not sure

I created one WA1 --------file1.txt and then creaed on WA2---file1.txt and make the changes in both the files one by one and
then login user1 and submit file1.txt through WA1 and then logout and login as a user2 and try to submit file1.txt from WA2 , come across the Resolve
conflict screen from where I select the Merge difference from Resolve conflict screen then it shows the merge screen

where i merged two files and once i go the save it throws the error

Couldn't save merged document.
error.sendfile.servermessage - Error moving temp file /.iwmnt/default/main/Java/WORKAREA/user1/jsp2/tmpAAAvea4dO to /.iwmnt/default/main/Java/WORKAREA/artor/jsp2/short.txt: Permission denied (error 13)

As far as article no 1518 I mentioned which has mentioned my earlier post it also giving me the same kind of thing but that merge is coming up in .orignal file but let me confirm again with my test and I am doing through Edit-copy To area but I will confirm again for that

Regards,
Nauman

Adam Stoller

Had file1.txt been submitted yet - or did you create it fresh in both workareas before submitting it?
The error is clearly a permissions problem - which user instigated the merge in which workarea?
What are the access rights on the file?

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

artor

Well WA1 has owned by group tsusers and WA2 has owned by same group and user1 and user2 both are from the same group and when any file is created it has 775 permission on unix box.
Well you open the merge utility and the conflicting files, merge utility creates the temporary files for each file and also put the merge result in temporary file so once u finished to resolve conflicts ans merged and click on save it save the data in ur file and keeps the original file for reverting and delete all the temporary file ...
but when i get the error all file appear in that directory where the actual file is located and where u start the merge.
Regards,

Adam Stoller

Couldn't save merged document.
error.sendfile.servermessage - Error moving temp file /.iwmnt/default/main/Java/WORKAREA/user1/jsp2/tmpAAAvea4dO to /.iwmnt/default/main/Java/WORKAREA/artor/jsp2/short.txt: Permission denied (error 13)

If you have access to a shell on the TeamSite server, when you're doing the merge through the UI - run iwfilestate on the file being merged. What bothers me about the error message is that it looks like the temporary file is in one workarea but the resultant file is in the other workarea.
I've done merges in both 5.5.2 and 6.1 (CCP) on Solaris and don't recall ever running into this error message.

If it persists, I suggest you make sure you can easily repeat the problem, document the steps (as explicitly as possible) and open a case with Support.

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