Obsolete Terminology

[Pierre-Yves David]

On Sun, Jul 22, 2012 at 08:01:06PM -0400, Greg Ward wrote:
> > |                     |                          | **conflicting**             |

> > |                     |                          |                             |
> > |                     |                          | *conflicting* is changeset  |
> > |                     |                          | that appears when multiple  |
> > |                     |                          | changesets are successors   |
> > |                     |                          | of the same precursor.      |
> 
> Hmmm. I'm torn on this. I completely understand why these two
> successors are considered "conflicting" (alternately, "in conflict").
> But the word "conflict" is pretty much taken already: it's what
> happens when I have to merge two revisions of a file with overlapping
> changes. You know, back in boring old-fashioned *first* order version
> control. ;-) I'm leery of using the same word for subtly related but
> distinct concepts.

Well, what do you think of

- clashing ?  (I like this one)
- rival ?     (bonus for not ending with "ing")
- colliding ? (meh, too close to conflicting)
- discording ?

-- 
Pierre-Yves David

http://www.logilab.fr/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120823/1813222d/attachment.pgp>