Question

I have a view in which I have checked-out 9 files , another team member wants to merge my changes in his activity but I do not wish to check in the files.

Is there a way to merge files without check in or some other alternative.

Was it helpful?

Solution

One way would be to use cleartool diff, in order to generate patches, that you can then compressed and mail in an archive (.zip), for the other developer to apply.

See cleartool diff.

That would be something like:

cleartool lsco -all -s -cview | xargs cleartool diff -diff_format -pred

The -diff_format option causes both the headers and differences to be reported in the style of the UNIX and Linux diff utility, writing a list of the changes necessary to convert the first file being compared into the second file, as follows:

  • The first number (or range of numbers in the form n,n) indicates line numbers in the first file being compared.
  • The second value is one of the following: a d c. These indicate whether lines are to be added, deleted, or changed.
  • The second number (or range of numbers) indicates line numbers in the second file being compared.
Licensed under: CC-BY-SA with attribution
Not affiliated with StackOverflow
scroll top