Re: Conflict storage in 1.7

2011-02-03 Thread Paul Burba
, 2010 at 12:07 PM, Bert Huijben wrote: >>> > >>> > >>> >> -Original Message- >>> >> From: hy...@hyrumwright.org [mailto:hy...@hyrumwright.org] On Behalf Of >>> >> Hyrum K. Wright >>> >> Sent:

Re: Conflict storage in 1.7

2010-12-13 Thread Hyrum K. Wright
>> >> -Original Message- >> >> From: hy...@hyrumwright.org [mailto:hy...@hyrumwright.org] On Behalf Of >> >> Hyrum K. Wright >> >> Sent: vrijdag 10 december 2010 17:11 >> >> To: Subversion Development >> >> Subject: Re: Conflict storag

Re: Conflict storage in 1.7

2010-12-12 Thread Stefan Sperling
On Sun, Dec 12, 2010 at 10:30:07AM +, Philip Martin wrote: > Stefan Sperling writes: > > > In 1.7, you get a tree conflict if a directory obstructs an addition > > of another directory during update: > > $ svn up > > Updating '.' ... > >C foo > > At revision 3. > > Summary of conflicts: >

Re: Conflict storage in 1.7

2010-12-12 Thread Philip Martin
Stefan Sperling writes: > In 1.7, you get a tree conflict if a directory obstructs an addition > of another directory during update: > $ svn up > Updating '.' ... >C foo > At revision 3. > Summary of conflicts: > Tree conflicts: 1 > $ svn st > ? C foo > > local unversioned, inco

Re: Conflict storage in 1.7

2010-12-11 Thread Stefan Sperling
ght > >> Sent: vrijdag 10 december 2010 17:11 > >> To: Subversion Development > >> Subject: Re: Conflict storage in 1.7 > >> > >> Hearing no objections, I'm going to mark this as DONE. > > > > I don't think we can properly mark unve

Re: Conflict storage in 1.7

2010-12-10 Thread Hyrum K. Wright
On Fri, Dec 10, 2010 at 12:07 PM, Bert Huijben wrote: > > >> -Original Message- >> From: hy...@hyrumwright.org [mailto:hy...@hyrumwright.org] On Behalf Of >> Hyrum K. Wright >> Sent: vrijdag 10 december 2010 17:11 >> To: Subversion Development >

RE: Conflict storage in 1.7

2010-12-10 Thread Bert Huijben
> -Original Message- > From: hy...@hyrumwright.org [mailto:hy...@hyrumwright.org] On Behalf Of > Hyrum K. Wright > Sent: vrijdag 10 december 2010 17:11 > To: Subversion Development > Subject: Re: Conflict storage in 1.7 > > Hearing no objections, I'm going t

Re: Conflict storage in 1.7

2010-12-10 Thread Hyrum K. Wright
Hearing no objections, I'm going to mark this as DONE. -Hyrum On Wed, Dec 8, 2010 at 11:09 AM, Hyrum K. Wright wrote: > The current state of conflict storage is such that all conflict > information is stored on the victim's node in the database.  While the > plan described in notes/wc-ng/conflic

Re: Conflict storage in 1.7

2010-12-08 Thread Branko Čibej
On 08.12.2010 20:09, Hyrum K. Wright wrote: > The current state of conflict storage is such that all conflict > information is stored on the victim's node in the database. While the > plan described in notes/wc-ng/conflict-storage is admirable, it > requires much more work than just shuffling data

Conflict storage in 1.7

2010-12-08 Thread Hyrum K. Wright
The current state of conflict storage is such that all conflict information is stored on the victim's node in the database. While the plan described in notes/wc-ng/conflict-storage is admirable, it requires much more work than just shuffling data bits around, and I'm hesitant to start in on it pri