Stefan Sperling wrote on Tue, Mar 01, 2011 at 14:01:54 +0100:
> On Tue, Mar 01, 2011 at 07:24:56PM +1100, Gavin Beau Baumanis wrote:
> > Ping. This submission has received no new comments.
>
> Thanks for the reminder. Committed in r1075802.
Thanks, Stefan.
(The patch had swapped out for me since
On Tue, Mar 01, 2011 at 07:24:56PM +1100, Gavin Beau Baumanis wrote:
> Ping. This submission has received no new comments.
Thanks for the reminder. Committed in r1075802.
Ping. This submission has received no new comments.
On 22/02/2011, at 8:31 AM, Daniel Becroft wrote:
> On Sun, Feb 13, 2011 at 2:15 AM, Daniel Shahaf
> wrote:
> Daniel Becroft wrote on Sat, Feb 12, 2011 at 08:37:12 +1000:
> > On Sat, Feb 12, 2011 at 7:31 AM, Daniel Shahaf
> > wrote:
> >
> >
On Sun, Feb 13, 2011 at 2:15 AM, Daniel Shahaf wrote:
> Daniel Becroft wrote on Sat, Feb 12, 2011 at 08:37:12 +1000:
> > On Sat, Feb 12, 2011 at 7:31 AM, Daniel Shahaf >wrote:
> >
> > > Daniel Becroft wrote on Sat, Feb 12, 2011 at 06:27:31 +1000:
> > > > On Fri, Feb 11, 2011 at 11:26 PM, Daniel
Daniel Becroft wrote on Sat, Feb 12, 2011 at 08:37:12 +1000:
> On Sat, Feb 12, 2011 at 7:31 AM, Daniel Shahaf
> wrote:
>
> > Daniel Becroft wrote on Sat, Feb 12, 2011 at 06:27:31 +1000:
> > > On Fri, Feb 11, 2011 at 11:26 PM, Daniel Shahaf > >wrote:
> > > > Daniel Becroft wrote on Thu, Feb 10,
On Sat, Feb 12, 2011 at 7:31 AM, Daniel Shahaf wrote:
> Daniel Becroft wrote on Sat, Feb 12, 2011 at 06:27:31 +1000:
> > On Fri, Feb 11, 2011 at 11:26 PM, Daniel Shahaf >wrote:
> > > Daniel Becroft wrote on Thu, Feb 10, 2011 at 07:21:30 +1000:
> > > > @@ -1118,6 +1120,33 @@ merge_binary_file(svn
Daniel Becroft wrote on Sat, Feb 12, 2011 at 06:27:31 +1000:
> On Fri, Feb 11, 2011 at 11:26 PM, Daniel Shahaf
> wrote:
> > Daniel Becroft wrote on Thu, Feb 10, 2011 at 07:21:30 +1000:
> > > @@ -1118,6 +1120,33 @@ merge_binary_file(svn_skel_t **work_items,
> > > + /* Attempt to merge the binary f
On Fri, Feb 11, 2011 at 11:26 PM, Daniel Shahaf wrote:
> [ disclaimer: I'm not familiar with wc internals yet; sorry; hope I'll
> learn something while reviewing this ]
>
> Daniel Becroft wrote on Thu, Feb 10, 2011 at 07:21:30 +1000:
> > >
> > Hey Stefan,
> >
> > It was only partially bypassing
[ disclaimer: I'm not familiar with wc internals yet; sorry; hope I'll
learn something while reviewing this ]
Daniel Becroft wrote on Thu, Feb 10, 2011 at 07:21:30 +1000:
> >
> Hey Stefan,
>
> It was only partially bypassing the work queue. The items to update the
> executable bit (and read/write
>
> > Index: subversion/libsvn_wc/merge.c
>> > ===
>> > --- subversion/libsvn_wc/merge.c (revision 1068136)
>> > +++ subversion/libsvn_wc/merge.c (working copy)
>> > @@ -1094,6 +1094,7 @@
>> >const char *l
On Wed, Feb 9, 2011 at 7:46 AM, Stefan Sperling wrote:
> On Wed, Feb 09, 2011 at 07:34:53AM +1000, Daniel Becroft wrote:
> > Hi,
> >
> > Attached is a completed patch to resolve issue 3686[1], where the
> executable
> > bit is not maintained during the merge of a binary file.
> >
> > I thought a
On Wed, Feb 09, 2011 at 07:34:53AM +1000, Daniel Becroft wrote:
> Hi,
>
> Attached is a completed patch to resolve issue 3686[1], where the executable
> bit is not maintained during the merge of a binary file.
>
> I thought about making this change more generic, and applying it to text
> files as
Hi,
Attached is a completed patch to resolve issue 3686[1], where the executable
bit is not maintained during the merge of a binary file.
I thought about making this change more generic, and applying it to text
files as well (there was discussion with performance of simple-case merging
a month ag
13 matches
Mail list logo
