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

Robert Cowham robert at vaccaperna.co.uk
Tue Oct 23 10:49:48 PDT 2001

Good suggestion.

However it highlights the problem of using resolve in 2 ways: multiple edits
on a file, propagating changes between branches.

Target/source are not quite so meaningful in the multiple edit conflict
situation. That said, you could word it as "you are merging someone else's
changes into your file in your workspace, so target=workspace file in this
instance, and source is the latest file in the depot (usually)".


> -----Original Message-----
> From: perforce-user-admin at perforce.com
> [mailto:perforce-user-admin at perforce.com]On Behalf Of Rick Macdonald
> Sent: Tuesday, October 23, 2001 06:18
> To: perforce-user at perforce.com
> Subject: RE: [p4] terminology: "yours" and "theirs" in resolve
> The funny thing about all this is that Perforce doc such as "p4 help
> integrate" and the p4win GUI both use the terms "source" and "target".
> There are references to "sync target files first" and "source revision
> range". Sometimes these are referred to as "from" and "to" files but more
> often source and target.
> I really think that source/target are the best words to use but as pointed
> out, it's not easy to change command line flags from -ay and -at to -at
> and -as since these already exist in resolve.
> Perhaps if the word "accept" was changed to "keep", then the flags could
> be -ks and -kt (keep source and keep target)...
> Hey - don't laugh (or groan)! Look at the p4 doc for resolve. The
> descriptions for the "accept" options say "keep"!
>           Accept:
>              at              Keep only changes to their file.
>              ay              Keep only changes to your file.
>            * am              Keep merged file.
>            * a               Keep autoselected file.
> So, the new options that don't conflict with the existing options would
> be:
>           Keep:
>              ks              Keep only changes to source file.
>              kt              Keep only changes to target file.
>            * km              Keep merged file.
>            * k               Keep autoselected file.
> That's a tough one to argue against, if I do say so myself!  ;-)
> ...RickM...
> _______________________________________________
> 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