Re: Perplexing results of SVN commit

2011-07-12 Thread Warren Jones
On Mon, Jul 11, 2011 at 07:13:22PM -0700, Ryan Schmidt wrote: > Sounds to me like operator error of the following kind: the developer > modified the files in the working copy, and also made identical modifications > to the corresponding pristine files in .svn/text-base (frequently this > happen

AW: AW: Perplexing results of SVN commit

2011-07-12 Thread Markus Schaber
Hi, Von: Les Mikesell [mailto:lesmikes...@gmail.com] > >> > >> Sounds to me like operator error of the following kind: the developer > >> modified the files in the working copy, and also made identical > >> modifications to the corresponding pristine files in .svn/text-base > >> (frequently this h

Re: Perplexing results of SVN commit

2011-07-12 Thread Ryan Schmidt
On Jul 12, 2011, at 07:43, Les Mikesell wrote: > Or even better, an optional cvs-like mode where you don't need the pristine > copies on the client at all. The request to allow working copies without text-base is filed here: http://subversion.tigris.org/issues/show_bug.cgi?id=525 Related is t

Re: Perplexing results of SVN commit

2011-07-12 Thread Stefan Sperling
On Tue, Jul 12, 2011 at 03:15:33PM +0200, Andreas Krey wrote: > On Mon, 11 Jul 2011 21:13:22 +, Ryan Schmidt wrote: > ... > > Sounds to me like operator error of the following kind: the developer > > modified the files in the working copy, and also made identical > > modifications to the corr

Re: Perplexing results of SVN commit

2011-07-12 Thread Andreas Krey
On Mon, 11 Jul 2011 21:13:22 +, Ryan Schmidt wrote: ... > Sounds to me like operator error of the following kind: the developer > modified the files in the working copy, and also made identical modifications > to the corresponding pristine files in .svn/text-base (frequently this > happens w

Re: AW: Perplexing results of SVN commit

2011-07-12 Thread Les Mikesell
On 7/12/11 7:18 AM, Markus Schaber wrote: Sounds to me like operator error of the following kind: the developer modified the files in the working copy, and also made identical modifications to the corresponding pristine files in .svn/text-base (frequently this happens when using a batch search-r

AW: Perplexing results of SVN commit

2011-07-12 Thread Markus Schaber
Hi, Ryan, Von: Ryan Schmidt [mailto:subversion-20...@ryandesign.com] > > Sounds to me like operator error of the following kind: the developer > modified the files in the working copy, and also made identical > modifications to the corresponding pristine files in .svn/text-base > (frequently this

RE: Perplexing results of SVN commit

2011-07-12 Thread Bert Huijben
> -Original Message- > From: Ryan Schmidt [mailto:subversion-20...@ryandesign.com] > Sent: dinsdag 12 juli 2011 4:13 > To: Warren Jones > Cc: users@subversion.apache.org > Subject: Re: Perplexing results of SVN commit > > On Jul 11, 2011, at 14:07, Warren Jones

Re: Perplexing results of SVN commit

2011-07-11 Thread Ryan Schmidt
On Jul 11, 2011, at 14:07, Warren Jones wrote: > One of our developers got perplexing results from an SVN commit. As far as I > can tell, this is what happened: > >1. Developer checks out trunk of SVN project to working directory. >2. "svn copy" some files from branch into working direc

Perplexing results of SVN commit

2011-07-11 Thread Warren Jones
One of our developers got perplexing results from an SVN commit. As far as I can tell, this is what happened: 1. Developer checks out trunk of SVN project to working directory. 2. "svn copy" some files from branch into working directory. 3. Edit and modify files copied from branch.