On Tue, Sep 13, 2011 at 11:15:39AM -0400, Bob Archer wrote:
> My question would be will this only elide merge info from child nodes
> that have been modified by the merge in the same way that in 1.7 child
> node merge info is only updated if that child node was a target of the
> merge?
Yes. The m
> On Sat, Sep 10, 2011 at 03:43:36AM +0200, Stefan Sperling wrote:
> > It seems that the elision algorithm is very basic at the moment, which
> > prevents this from being really useful. Subversion only elides
> > mergeinfo which exactly matches the mergeinfo of a parent.
> > It doesn't perform elis
[Paul Burba]
> Given:
>
> A path P and some path-wise child of P called C:
> Assume both P and C have explicit mergeinfo.
> Assume there is no intermediate patch between P and C with explicit
> mergeinfo.
> Assume P and C are at the same revision as are any intermediate
> paths between t
On Sat, Sep 10, 2011 at 02:08:38PM -0400, Paul Burba wrote:
> Given:
>
> A path P and some path-wise child of P called C:
> Assume both P and C have explicit mergeinfo.
> Assume there is no intermediate patch between P and C with explicit
> mergeinfo.
> Assume P and C are at the same revi
On Sat, Sep 10, 2011 at 1:11 PM, Stefan Sperling wrote:
> On Sat, Sep 10, 2011 at 07:07:40PM +0200, Stefan Sperling wrote:
>> On Sat, Sep 10, 2011 at 12:45:50PM -0400, Paul Burba wrote:
>> > ### This leaves us with a situation where r4 hasn't been merged
>> > ### to the branch:
>> >
>> > trunk@1
On Sat, Sep 10, 2011 at 1:07 PM, Stefan Sperling wrote:
> On Sat, Sep 10, 2011 at 12:45:50PM -0400, Paul Burba wrote:
>> ### This leaves us with a situation where r4 hasn't been merged
>> ### to the branch:
>>
>> trunk@1167503>svn st
>> M branch
>> M branch\B
>> M branch\
On Sat, Sep 10, 2011 at 07:07:40PM +0200, Stefan Sperling wrote:
> On Sat, Sep 10, 2011 at 12:45:50PM -0400, Paul Burba wrote:
> > ### This leaves us with a situation where r4 hasn't been merged
> > ### to the branch:
> >
> > trunk@1167503>svn st
> >M branch
> >M branch\B
> >
On Sat, Sep 10, 2011 at 12:45:50PM -0400, Paul Burba wrote:
> ### This leaves us with a situation where r4 hasn't been merged
> ### to the branch:
>
> trunk@1167503>svn st
>M branch
>M branch\B
> M branch\D\gamma
>
> trunk@1167503>svn pl -vR
> Properties on 'branch
On Sat, Sep 10, 2011 at 5:43 AM, Stefan Sperling wrote:
> On Sat, Sep 10, 2011 at 03:43:36AM +0200, Stefan Sperling wrote:
>> It seems that the elision algorithm is very basic at the moment,
>> which prevents this from being really useful. Subversion only elides
>> mergeinfo which exactly matches
On Sat, Sep 10, 2011 at 03:43:36AM +0200, Stefan Sperling wrote:
> It seems that the elision algorithm is very basic at the moment,
> which prevents this from being really useful. Subversion only elides
> mergeinfo which exactly matches the mergeinfo of a parent.
> It doesn't perform elision if mer
Users with lots of subtree mergeinfo may want to clean it up by
eliding subtree mergeinfo without actually performing a merge.
There seem to be scripts floating around that perform this task.
But there is no "official" solution yet, it seems.
Would it be useful to allow mergeinfo elision to take p
11 matches
Mail list logo
