[p4] terminology: "yours" and "theirs" in resolve

Dave Lewis dlewis at vignette.com
Tue Oct 23 11:39:22 PDT 2001


  > Repeating the prompt would sure be a big help. I like Jeff's suggestion as
  > well, but it would be nice addition to see which workspace file is being
  > changed:
  >           yours  = //depot/src/lib/gui/x.java#3
  >                  = /home/rickm/src/mainline/lib/gui/x.java
  >           base   = //depot/src/lib/gui/x.java#2
  >           theirs = //depot/release1/gui/x.java
  >           diffs:  0 (yours) + 1 (theirs) + 0 (both) + 1 (conflict)
  > 
  > In the case of an edit conflict, I think this might look like this, but
  > I'm not sure about the revision numbers and had to guess here:
  > 
  >           yours  = //depot/src/lib/gui/x.java#1
  >                  = /home/rickm/src/mainline/lib/gui/x.java
  >           base   = //depot/src/lib/gui/x.java#1
  >           theirs = //depot/src/lib/gui/x.java#2
  >           diffs:  0 (yours) + 1 (theirs) + 0 (both) + 1 (conflict)
  > 
  > Does everybody agree that the above leaves nothing to the imagination?
  > "yours/theirs" is still unfortunate, but at least I can see what I'm
  > working with.

yes, I like this!

dave



More information about the perforce-user mailing list