[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: diff3 followups

From: Kevin Pilch-Bisson <kevin_at_pilch-bisson.net>
Date: 2002-03-14 01:35:52 CET

On Wed, Mar 13, 2002 at 06:42:54PM -0600, Karl Fogel wrote:
> Ben Collins-Sussman <sussman@collab.net> writes:
> > * if a conflict occurs, users now have to hand-remove *three* backup
> > files (instead of a single .rej file). if people think this is too
> > burdensome, maybe we can just do timestamp comparisons instead --
> > i.e., if the user has touched the file since the conflict, assume
> > the conflict is gone. Is this preferable?
>
> So the plan would be:
>
> - The commit succeeds if the user has touched the working file
> since it received the conflict, otherwise the commit bombs
> complaining of an unresolved conflict. And, after a commit of
> the working file succeeds, we clean up the three "backup"
> fulltexts.
>
> Sounds good to me...
>
Honestly, I don't like the idea of just the timestamp. I think it would be
good to record a checksum instead. That way at least the file must actually
be modified. The other option would be to grep the file for the conflict
markers, but I think that is overkill. Other's have pointed out times when
they might want to actually check in a conflicted file, but I don't want to
make it too easy.

I won't be extremely upset if it goes the other way, but this would be my
preference.

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kevin Pilch-Bisson                    http://www.pilch-bisson.net
     "Historically speaking, the presences of wheels in Unix
     has never precluded their reinvention." - Larry Wall
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

  • application/pgp-signature attachment: stored
Received on Thu Mar 14 01:40:01 2002

This is an archived mail posted to the Subversion Dev mailing list.