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

Re: Locking consensus(es) so far

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2004-10-14 15:50:35 CEST

On Oct 14, 2004, at 9:41 AM, Mark Phippard wrote:
>
> I just think that we cannot just wush away the conflict. The user
> needs
> to know that they have created a conflict and they should review the
> files
> before committing there change.

I'm suggesting that the UI be something like this:

  $ svn update hijacked-file.c
  WARNING: you have changed this file without locking it, which is bad!
  WARNING: a newer version of the file has been saved in
'hijacked-file-backup.c'
  WARNING: please examine the newer file before committing your own
changes!

How is that "wushing away" the conflict? Isn't that enough information
to make the user review the newer file?

The alternative is:

  $ svn update hijacked-file.c
  C hijacked-file.c

  ### "huh? what does C mean?"

  $ svn ls
  hijacked-file.c
  hijacked-file.c.r4
  hijacked-file.c.r5
  hijacked-file.c.mine

  ### "huh? what are all these extra files?"

  $ svn commit hijacked-file.c
  svn: err: 'hijacked-file.c' remains in conflict.

  ### "huh? what does that mean?"
  ### calls administrator.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 14 15:51:17 2004

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