[p4] Wrong (?) base revision integrating back from a child branch

[Peter Stephenson]

"Alen Ladavac" wrote:
> Thanks for your suggestion. We considered doing that (though we just
> manually resolved all conficts in the end), but it is not The Solution.

There's an alternative possibility, which still may not fit your needs.
You can perform all the edits during the "resolve" process by selecting
"edit" or "merge" from the choices.  If you just want to edit a few
files, run "p4 resolve" on those files first, then do an automated resolve
on the others.  The submitted files are still marked as integrated.

You can even use "p4 resolve -f" to edit the files after the resolve has
finished.  However, this is a little annoying as it insists on trying to
merge the files together again from scratch.  I often wish there was a
"touch up the resolve" option.

-- 
Peter Stephenson <pws at csr.com>                  Software Engineer
CSR Ltd., Science Park, Milton Road,
Cambridge, CB4 0WH, UK                          Tel: +44 (0)1223 692070


**********************************************************************
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed. If you have received this email in error please notify
the system manager.

This footnote also confirms that this email message has been swept by
MIMEsweeper for the presence of computer viruses.

www.mimesweeper.com
**********************************************************************