Re: conflict-storage, and filenames

2010-05-10 Thread Stefan Sperling
On Mon, May 10, 2010 at 01:37:36AM -0400, Greg Stein wrote: > On Sun, May 9, 2010 at 18:21, Bert Huijben wrote: > >... > >> From: Stefan Sperling [mailto:s...@elego.de] > >... > >> > As Bert explained, we need to remove them when the user runs "svn > >> > resolved". He also noted that (somtimes) i

Re: conflict-storage, and filenames

2010-05-09 Thread Greg Stein
On Sun, May 9, 2010 at 18:21, Bert Huijben wrote: >... >> From: Stefan Sperling [mailto:s...@elego.de] >... >> > As Bert explained, we need to remove them when the user runs "svn >> > resolved". He also noted that (somtimes) it is possible manually >> > resolve a conflict by removing all the confl

RE: conflict-storage, and filenames

2010-05-09 Thread Bert Huijben
> -Original Message- > From: Stefan Sperling [mailto:s...@elego.de] > Sent: maandag 10 mei 2010 0:05 > To: Greg Stein > Cc: Bert Huijben; dev@subversion.apache.org > Subject: Re: conflict-storage, and filenames > > On Sun, May 09, 2010 at 04:54:17PM -0400, Greg

Re: conflict-storage, and filenames

2010-05-09 Thread Stefan Sperling
On Sun, May 09, 2010 at 04:54:17PM -0400, Greg Stein wrote: > On Sun, May 9, 2010 at 09:43, Stefan Sperling wrote: > > Well, I've been under the impression that the names are currently > > 100% predictable. Is that not the case? > > Nope. > > $ svn add foo.c foo.c.left foo.c.1.left > $ # do some

Re: conflict-storage, and filenames

2010-05-09 Thread Greg Stein
On Sun, May 9, 2010 at 09:43, Stefan Sperling wrote: > On Sat, May 08, 2010 at 11:15:31PM -0400, Greg Stein wrote: >> Hey all, >> >> In wc-1, we record filenames where merge sources are stored, and where >> property rejects are written. These are: >> >> entry->conflict_wrk, ->conflict_old, ->confl

RE: conflict-storage, and filenames

2010-05-09 Thread Bert Huijben
> -Original Message- > From: Stefan Sperling [mailto:s...@elego.de] > Sent: zondag 9 mei 2010 15:43 > To: Greg Stein > Cc: dev@subversion.apache.org > Subject: Re: conflict-storage, and filenames > > On Sat, May 08, 2010 at 11:15:31PM -0400, Greg Stein wrote: >

Re: conflict-storage, and filenames

2010-05-09 Thread Stefan Sperling
On Sat, May 08, 2010 at 11:15:31PM -0400, Greg Stein wrote: > Hey all, > > In wc-1, we record filenames where merge sources are stored, and where > property rejects are written. These are: > > entry->conflict_wrk, ->conflict_old, ->conflict_new, and ->prejfile > > These file names do not appear

conflict-storage, and filenames

2010-05-08 Thread Greg Stein
Hey all, In wc-1, we record filenames where merge sources are stored, and where property rejects are written. These are: entry->conflict_wrk, ->conflict_old, ->conflict_new, and ->prejfile These file names do not appear to have any corresponding values in the proposed skels detailed in notes/wc-