Transcript Slide 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 p4 p4 p4 sync ola move –f foo ola resolve submit THIS IS A CHANGED FOO client depot edit #1 foo #0 bar #0 ola THIS IS AN OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #1 #1 p4 sync ola THIS IS A CHANGED FOO client depot THIS IS AN OLA edit #1 foo #0 bar #1 ola THIS IS AN OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #1 #1 p4 move –f foo ola THIS IS A CHANGED FOO client depot #0 foo #0 bar ? edit #1 ola THIS IS AN OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #1 #1 p4 resolve THIS IS A CHANGED OLA client depot #0 foo #0 bar edit #1 ola THIS IS AN OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #1 #1 p4 submit THIS IS A CHANGED OLA client depot #0 foo #0 bar #2 ola THIS IS A CHANGED OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #2 THIS IS AN OLA #1 #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. This time, we want to resolve each edit incrementally rather than all at once. How to do it: p4 p4 p4 p4 p4 p4 p4 sync bar#1 move –f foo bar resolve sync ola move –f bar ola resolve submit THIS IS A CHANGED FOO client depot edit #1 foo #0 bar #0 ola THIS IS AN OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #1 #1 p4 sync bar#1 THIS IS A CHANGED FOO client depot THIS IS A BAR edit #1 foo #1 bar #0 ola THIS IS AN OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #1 #1 p4 move -f foo bar THIS IS A CHANGED FOO client depot #0 foo ? edit #1 bar #0 ola THIS IS AN OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #1 #1 p4 resolve THIS IS A CHANGED BAR client depot #0 foo edit #1 bar #0 ola THIS IS AN OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #1 #1 p4 sync ola THIS IS A CHANGED BAR client depot #0 foo THIS IS AN OLA edit #1 bar #1 ola THIS IS AN OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #1 #1 p4 move –f bar ola THIS IS A CHANGED BAR client depot #0 foo #0 bar ? edit #1 ola THIS IS AN OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #1 #1 p4 resolve THIS IS A CHANGED OLA client depot #0 foo #0 bar edit #1 ola THIS IS AN OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #1 #1 p4 submit THIS IS A CHANGED OLA client depot #0 foo #0 bar #2 ola THIS IS A CHANGED OLA #2 THIS IS A FOO #2 THIS IS A BAR #1 #2 THIS IS AN OLA #1 #1 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 p4 p4 p4 sync dev move –f main dev resolve 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. THIS IS A CHANGED FILE client depot edit #1 main #0 dev THIS IS A FILE THIS IS MY FILE #1 #1 p4 sync dev THIS IS A CHANGED FILE client depot THIS IS MY FILE edit #1 main #1 dev THIS IS A FILE THIS IS MY FILE #1 #1 p4 move –f main dev THIS IS A CHANGED FILE client depot #0 main ? edit #1 dev THIS IS A FILE THIS IS MY FILE #1 #1 p4 resolve THIS IS MY CHANGED FILE client depot #0 main edit #1 dev THIS IS A FILE THIS IS MY FILE #1 #1 p4 submit THIS IS MY CHANGED FILE client depot #0 main #2 dev THIS IS MY CHANGED FILE THIS IS A FILE #1 #2 THIS IS MY FILE #1