O'Reilly logo

Learning Perforce SCM by Robert Cowham, Neal Ralph Firth

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

How streams handle renames

We saw in Chapter 8, Classic Branching and Merging that handling renames of files across different branches can be problematic. With streams, these problem situations are detected and handled straight forwardly. For example, renaming a file on one stream and then finding that the equivalent file has been edited on the other stream will show up in your resolve like this:

How streams handle renames

In the preceding screenshot, we see the combination of a resolve dialog and the revision graph for the files involved. The file execvms.c was edited on main, and has been renamed on the Bruno_dev stream to execvms-new.c.

The next screenshot clearly shows ...

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required