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
21
Embed
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.
This document is posted to help you gain knowledge. Please leave a comment to let me know what you think about it! Share it to your friends and learn new things together.
Transcript
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 olap4 move –f foo olap4 resolvep4 submit
depot
client
foo
#1
#1
THISIS AFOO
bar
THISIS ACHANGEDFOO
THISIS ABAR
#1
ola
THISIS ANOLA
#1
#0 #0
#2 #2
edit
depot
client
foo
#1
#1
THISIS AFOO
bar
THISIS ACHANGEDFOO
THISIS ABAR
#1
ola
THISIS ANOLA
#1
#0
#2 #2
p4 sync ola
THISIS ANOLA
#1edit
depot
client
foo
#1
THISIS AFOO
bar
THISIS ABAR
#1
ola
THISIS ANOLA
#1
#0
#2 #2
p4 move –f foo ola
THISIS ACHANGEDFOO
#1#1edit
?
#0
depot
client
foo
#1
THISIS AFOO
p4 resolve
bar
THISIS ACHANGEDOLA
THISIS ABAR
#1
ola
THISIS ANOLA
#1
#1
#2 #2
#1edit
#0 #0
depot
client
foo
#1
THISIS AFOO
p4 submit
bar
THISIS ACHANGEDOLA
THISIS ABAR
#1
ola
THISIS ANOLA
#1
#2 #2
#2#0 #0
THISIS ACHANGEDOLA
#2
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.