[p4] Does this workflow seem odd to you?
Tetrick, Cary
ctetrick at midway.com
Fri May 11 13:46:35 PDT 2007
This can happen easily if there are a lot of changes going into the same
files. The work in step 5 should be limited to dealing with problems
that arise from the newly resolved code.
Good communication among users can go a long way to help too, and this
is the preferred method.
They can always get properties on the file to find out who else has it
open, and coordinate with them.
They could try locking the file just before step 3, assuming they can
sync, resolve, fix problems related to the resolve, and submit quickly,
they won't hold people up too long.
It can be confusing for other users when they attempt to submit, or open
the file however. So users should email others when using locks.
Merges don't always go right - especially in a heavily modified file.
Interactive merges can take time, but should be used when the changes
are very large.
-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Ivey, William
Sent: Friday, May 11, 2007 11:43 AM
To: perforce-user at perforce.com
Subject: [p4] Does this workflow seem odd to you?
I've got a user who is complaining that every time they resolve
a file they have to resolve even differences they've already resolved.
Here's their workflow:
1. Open file for editing
2. Work on it
3. Sync someone else's changes to the same file
4. Do the resolve
5. Work some more on it
6. Repeat steps 3-5 a few times
7. Finally submit it
What the user complains about is that at step 7 it still needs
to be resolved even though it effectively has been resolved.
(That is, he could simply do an accept yours on it and be fine.)
This doesn't surprise me at all, but it upsets him.
Further, he's been using "merge" instead of "accept yours"
so sometimes the result is not at all what he expects. (This
seems a little strange, but I'm not totally shocked.)
Anyone else using a workflow like that? If so, any advice
or suggestions to keep this user happy?
-Wm
X26150 (512-340-6150)
_______________________________________________
perforce-user mailing list - perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user
More information about the perforce-user
mailing list