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.

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.

How to do it:

p4 sync bar#1p4 move –f foo barp4 resolvep4 sync olap4 move –f bar 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

p4 sync bar#1

bar

THISIS ACHANGEDFOO

THISIS ABAR

#1

ola

THISIS ANOLA

#1

#1 #0

#2 #2

THISIS ABAR

edit

depot

client

foo

#1

THISIS AFOO

p4 move -f foo bar

bar

THISIS ACHANGEDFOO

THISIS ABAR

#1

ola

THISIS ANOLA

#1

#1 #0

#2 #2

#1edit

?

#0

depot

client

foo

#1

THISIS AFOO

p4 resolve

bar

THISIS ACHANGEDBAR

THISIS ABAR

#1

ola

THISIS ANOLA

#1

#1 #0

#2 #2

#1edit

#0

depot

client

foo

#1

THISIS AFOO

p4 sync ola

bar

THISIS ACHANGEDBAR

THISIS ABAR

#1

ola

THISIS ANOLA

#1

#1 #1

#2 #2

#1edit

#0

THISIS ANOLA

depot

client

foo

#1

THISIS AFOO

p4 move –f bar ola

bar

THISIS ACHANGEDBAR

THISIS ABAR

#1

ola

THISIS ANOLA

#1

#1

#2 #2

#1edit

#0 #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

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 devp4 move –f main devp4 resolvep4 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.

depot

client

main

#1

THISIS AFILE

dev

#0

THISIS MYFILE

#1

THISIS ACHANGEDFILE

#1edit

depot

client

main

#1

THISIS AFILE

p4 sync dev

dev

#1

THISIS MYFILE

#1

THISIS ACHANGEDFILE

#1edit

THISIS MYFILE

depot

client

main

#1

THISIS AFILE

p4 move –f main dev

dev

THISIS MYFILE

#1

THISIS ACHANGEDFILE

#1edit

#0

depot

client

main

#1

THISIS AFILE

p4 move –f main dev

dev

THISIS MYFILE

#1

THISIS ACHANGEDFILE

#1edit

#0

?

depot

client

main

#1

THISIS AFILE

p4 resolve

dev

THISIS MYFILE

#1

THISIS MYCHANGEDFILE

#1edit

#0

depot

client

main

p4 submit

dev

THISIS MYCHANGEDFILE

#2

THISIS MYCHANGEDFILE

#2#0

#1

THISIS AFILE

THISIS MYFILE

#1