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

Rick Macdonald rickm at vsl.com
Tue Oct 23 07:51:00 PDT 2001


On Tue, 23 Oct 2001, Robert Cowham wrote:

> For the command line resolve "dialog" I put in a request years ago that the
> files listed should have a (yours) and (theirs) tagged on after each name.
> Also, that the names should be repeated before each prompt, because if you
> do help or a diff command, the names of the files can scroll off the screen
> and you may forget which file you are on. (Obviously less of a problem in
> the GUI).
> 
> If anyone else would like to email support on this issue.....!

Yes, please!!!

> > -----Original Message-----
> > From: perforce-user-admin at perforce.com
> > [mailto:perforce-user-admin at perforce.com]On Behalf Of Bert Lindgren
> > Sent: Tuesday, October 23, 2001 09:43
> > To: Paul Goffin
> > Cc: perforce-user at perforce.com
> > Subject: Re: [p4] terminology: "yours" and "theirs" in resolve
> >
> >
> > My problems with yours/theirs is not terminology but more that
> > perforce does not tell you what they are at the point of
> > resolution. Instead, I find myself editing or diff'ing yours or
> > theirs in some desperate attempt to determine which is which.
> >
> > In other words, anything is fine -- A/B, X/Y (or even
> > Yours/Theirs) -- as long as the current definitions are clearly
> > defined during resolution.
> >
> > Finally, the 'definition' I ask for could take the following forms
> >     //depot/proj/dev/file.x#5
> >     ... head/date/label/etc
> >     //depot/proj/dev/file.x#5 with changes #5438,#5487 applied
> > (for "submission-targeted" integrations)
> >
> > While you're at it, what about defining 'base' in these terms as well?!?
> >
> >
> > Thanks,
> >   Bert
> >
> > Paul Goffin wrote:
> >
> > > I've had this conversation with Perforce in the
> > > past - their view then was:
> > >
> > > "Yes we know it's awful but we can't come up
> > > with anything better.  If you do, please let
> > > us know..."
> > >
> > > So suggestions please....
> > >
> > > Paul.
> > >
> > > > -----Original Message-----
> > > > From: Rick Macdonald [mailto:rickm at vsl.com]
> > > > Sent: 23 October 2001 00:52
> > > > To: perforce-user at perforce.com
> > > > Subject: [p4] terminology: "yours" and "theirs" in resolve
> > > >
> > > >
> > > >
> > > > For me, a much bigger terminolgy problem is with "yours" and
> > > > "theirs" when
> > > > resolving. Is "yours" always the workspace file, or is it always the
> > > > target file, or is it never always either?
> > > >
> > > > ...RickM...
> > > >
> > > > _______________________________________________
> > > > perforce-user mailing list  -  perforce-user at perforce.com
> > > > http://maillist.perforce.com/mailman/listinfo/perforce-user
> > > >
> > > >
> > > > This footnote confirms that this email message has been swept by
> > > > MIMEsweeper for the presence of computer viruses.
> > > >
> > >
> > >
> > ------------------------------------------------------------------
> > -----------------------------------------------
> > > The information contained in this message is confidential and
> > is intended
> > > for the addressee(s) only.  If you have received this message
> > in error or
> > > there are any problems please notify the originator immediately.  The
> > > unauthorized use, disclosure, copying or alteration of this message is
> > > strictly forbidden. Baltimore Technologies plc will not be
> > liable for direct,
> > > special, indirect or consequential damages arising from
> > alteration of the
> > > contents of this message by a third party or as a result of any
> > virus being
> > > passed on.
> > >
> > > In addition, certain Marketing collateral may be added from
> > time to time to
> > > promote Baltimore Technologies products, services, Global e-Security or
> > > appearance at trade shows and conferences.
> > >
> > > This footnote confirms that this email message has been swept by
> > > Baltimore MIMEsweeper for Content Security threats, including
> > > computer viruses.
> > >
> > > _______________________________________________
> > > perforce-user mailing list  -  perforce-user at perforce.com
> > > http://maillist.perforce.com/mailman/listinfo/perforce-user
> >
> > _______________________________________________
> > perforce-user mailing list  -  perforce-user at perforce.com
> > http://maillist.perforce.com/mailman/listinfo/perforce-user
> >
> 
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
> 

...RickM...




More information about the perforce-user mailing list