On Fri, Feb 15, 2013 at 03:07:36PM +0100, Stefan Sperling wrote:
> On Fri, Feb 15, 2013 at 01:12:49PM +, Philip Martin wrote:
> > The way move-update works is that an update that attempts to change a
> > move source raises move-away-edit tree-conflicts on the move source.
> > The user resolves
Stefan Sperling writes:
> On Fri, Feb 15, 2013 at 01:12:49PM +, Philip Martin wrote:
>>
>> When such an update happens a move-away-edit tree-conflict is raised but
>> now it cannot be resolved as 'mine-conflict' to transfer the changes to
>> the move destination as the move source is not sui
On Fri, Feb 15, 2013 at 10:28 AM, Bert Huijben wrote:
> I didn't write it down, but my intention would be to auto resolve everything
> within reach of the update.
>
> (root = root of wc)
> root/trunk
> root/branches
> root/branches/1.6.x
> root/branches/1.7.x
>
> svn up root/trunk
>
> So in this
> -Original Message-
> From: Mark Phippard [mailto:markp...@gmail.com]
> Sent: vrijdag 15 februari 2013 16:07
> To: Bert Huijben
> Cc: Philip Martin; dev@subversion.apache.org
> Subject: Re: move conflict resolution UI (was: Re: branch 1.8 or at least
start
>
> -Original Message-
> From: Mark Phippard [mailto:markp...@gmail.com]
> Sent: Friday, 15 February 2013 09:23
> To: Philip Martin; dev@subversion.apache.org
> Subject: Re: move conflict resolution UI (was: Re: branch 1.8 or at least
start
> making alpha releases?)
>
&
On Fri, Feb 15, 2013 at 9:57 AM, Bert Huijben wrote:
>
>
>> -Original Message-
>> From: Mark Phippard [mailto:markp...@gmail.com]
>> Sent: vrijdag 15 februari 2013 15:23
>> To: Philip Martin; dev@subversion.apache.org
>> Subject: Re: move conflict reso
> -Original Message-
> From: Mark Phippard [mailto:markp...@gmail.com]
> Sent: vrijdag 15 februari 2013 15:23
> To: Philip Martin; dev@subversion.apache.org
> Subject: Re: move conflict resolution UI (was: Re: branch 1.8 or at least
start
> making alpha releases?)
&
On Fri, Feb 15, 2013 at 9:20 AM, Mark Phippard wrote:
> On Fri, Feb 15, 2013 at 9:07 AM, Stefan Sperling wrote:
>
>> Note that I am referring to options offered by the CLI user interface,
>> not the API. The API might expose more low-level operations as has been
>> requested by GUI client develop
On Fri, Feb 15, 2013 at 9:07 AM, Stefan Sperling wrote:
> Note that I am referring to options offered by the CLI user interface,
> not the API. The API might expose more low-level operations as has been
> requested by GUI client developers in the past. But since we haven't
> really advanced the c
9 matches
Mail list logo
