[p4] Guidelines for codelines?
chuck.karish at gmail.com
Sat Nov 22 11:14:53 PST 2008
On Fri, Nov 21, 2008 at 7:08 AM, Jeff A. Bowles <jab at pobox.com> wrote:
> I have had to talk to new groups of perforce users, a lot, and often run
> into the developer who says, "I refuse to do merges, ever."
> I can't easily call that person a !#*!( incompetent who refuses to even KNOW
> about a tool, in a class. Really, I cannot.
Right. It's not your place as a source control specialist to dictate
development strategy. The engineering leadership should sort that
out. One might hope that they'd do so with appropriate input from the
source management people.
The input we might offer could be along the lines of "Merging is the
price we pay for the freedom to do concurrent development. I can
set up our source control system so only one user at a time can work
on a file. You decide whether that's how you want to work and whether
we can accomplish our goals that way."
Another message I hope to hear from the engineering leadership is
"We're a team. Let's work together. If you have to merge against
code you don't understand sit down with the author of the other change
and make sure that the merged file does what's right for both of you."
There's at least one tool in the Public Depot that does something close
to what "cvs blame" does, showing you who last changed each line in a
source file. Showing developers how to find the people with whom they
should collaborate is the first step in helping them perform correct merges.
Chuck Karish karish at well.com (415) 317-0182
More information about the perforce-user