1. Resolving against moved files The setup: we have foo open for edit and want to submit, but it has been renamed, first to bar and then to ola. We need to resolve our foo with the edits in the depot and submit it as ola. How to do it: p4 sync ola p4 move –f foo ola p4 resolve p4 submit

2. depot client foo #1 THIS IS A FOO bar THIS IS A CHANGED FOO THIS IS A BAR #1 ola THIS IS AN OLA #1 #0 #2 edit

3. depot client foo #1 THIS IS A FOO bar THIS IS A CHANGED FOO THIS IS A BAR #1 ola THIS IS AN OLA #1 #0 #2 p4 sync ola THIS IS AN OLA #1 edit

4. depot client foo #1 THIS IS A FOO bar THIS IS A BAR #1 ola THIS IS AN OLA #1 #0 #2 p4 move –f foo ola THIS IS A CHANGED FOO #1 edit ? #0

5. depot client foo #1 THIS IS A FOO p4 resolve bar THIS IS A CHANGED OLA THIS IS A BAR #1 ola THIS IS AN OLA #1 #2 #1 edit #0

6. depot client foo #1 THIS IS A FOO p4 submit bar THIS IS A CHANGED OLA THIS IS A BAR #1 ola THIS IS AN OLA #1 #2 #0 THIS IS A CHANGED OLA #2

7. Resolving against moved files The setup: we have foo open for edit and want to submit, but it has been renamed, first to bar and then to ola. This time, we want to resolve each edit incrementally rather than all at once. How to do it: p4 sync bar#1 p4 move –f foo bar p4 resolve p4 sync ola p4 move –f bar ola p4 resolve p4 submit

8. depot client foo #1 THIS IS A FOO bar THIS IS A CHANGED FOO THIS IS A BAR #1 ola THIS IS AN OLA #1 #0 #2 edit

9. depot client foo #1 THIS IS A FOO p4 sync bar#1 bar THIS IS A CHANGED FOO THIS IS A BAR #1 ola THIS IS AN OLA #1 #0 #2 THIS IS A BAR edit

10. depot client foo #1 THIS IS A FOO p4 move -f foo bar bar THIS IS A CHANGED FOO THIS IS A BAR #1 ola THIS IS AN OLA #1 #0 #2 #1 edit ? #0

11. depot client foo #1 THIS IS A FOO p4 resolve bar THIS IS A CHANGED BAR THIS IS A BAR #1 ola THIS IS AN OLA #1 #0 #2 #1 edit #0

12. depot client foo #1 THIS IS A FOO p4 sync ola bar THIS IS A CHANGED BAR THIS IS A BAR #1 ola THIS IS AN OLA #1 #2 #1 edit #0 THIS IS AN OLA

13. depot client foo #1 THIS IS A FOO p4 move –f bar ola bar THIS IS A CHANGED BAR THIS IS A BAR #1 ola THIS IS AN OLA #1 #2 #1 edit #0 ?

14. depot client foo #1 THIS IS A FOO p4 resolve bar THIS IS A CHANGED OLA THIS IS A BAR #1 ola THIS IS AN OLA #1 #2 #1 edit #0

15. depot client foo #1 THIS IS A FOO p4 submit bar THIS IS A CHANGED OLA THIS IS A BAR #1 ola THIS IS AN OLA #1 #2 #0 THIS IS A CHANGED OLA #2

16. Reparenting work in progress The setup: we have main open for edit but want to submit the edit into our existing dev branch. How to do it: p4 sync dev p4 move –f main dev p4 resolve p4 submit The “move -f” command does all of the work of moving the local file over and setting up a resolve that will merge our edit into the dev branch.

17. depot client main #1 THIS IS A FILE dev #0 THIS IS MY FILE #1 THIS IS A CHANGED FILE #1 edit

18. depot client main #1 THIS IS A FILE p4 sync dev dev #1 THIS IS MY FILE #1 THIS IS A CHANGED FILE #1 edit THIS IS MY FILE

19. depot client main #1 THIS IS A FILE p4 move –f main dev dev THIS IS MY FILE #1 THIS IS A CHANGED FILE #1 edit #0 depot client main #1 THIS IS A FILE p4 move –f main dev dev THIS IS MY FILE #1 THIS IS A CHANGED FILE #1 edit #0 ?

20. depot client main #1 THIS IS A FILE p4 resolve dev THIS IS MY FILE #1 THIS IS MY CHANGED FILE #1 edit #0

21. depot client main p4 submit dev THIS IS MY CHANGED FILE #2 THIS IS MY CHANGED FILE #2#0 #1 THIS IS A FILE THIS IS MY FILE #1