On Mon, Sep 12, 2011 at 11:52:01AM -0400, David Carson wrote:
> > We could allow the existing elision code to be invoked without running
> > a merge. An option like --elide-mergeinfo could be added to the
> > 'svn mergeinfo' command for this purpose. Would this be useful?
> >
>
> Yes, I think such
On Fri, Sep 9, 2011 at 6:40 PM, Stefan Sperling wrote:
> On Fri, Sep 09, 2011 at 03:00:53PM -0400, David Carson wrote:
> > OK, so let's try again. I've merged a change from another branch, which
> is
> > a commit with a single file changed. The result is much better, but let
> me
> > verify tha
On Sat, Sep 10, 2011 at 12:40:11AM +0200, Stefan Sperling wrote:
> It would help if you could present examples where elision does not
> work for you, so we can fix 'svn merge'.
The following quote from
https://svn.apache.org/repos/asf/subversion/trunk/subversion/libsvn_client/mergeinfo.h
provides
On Fri, Sep 09, 2011 at 03:00:53PM -0400, David Carson wrote:
> OK, so let's try again. I've merged a change from another branch, which is
> a commit with a single file changed. The result is much better, but let me
> verify that I understand my results:
> - file a/b/c/foo.c shows the file change
On Fri, Sep 9, 2011 at 12:38 PM, Stefan Sperling wrote:
> On Fri, Sep 09, 2011 at 12:17:15PM -0400, David Carson wrote:
> > To that end, I installed 1.7.0-rc2 with a snapshot of our repository, so
> I
> > could experiment and see for myself. I did a simple merge from one
> branch
> > to another.
> We have a repository that is seriously cluttered with the svn:mergeinfo
> property. I don't believe we ever used the buggy 1.5.x versions that added
> the property erroneously (although I could be wrong). However, due to a lax
> policy regarding where merges should occur, the property is now at
On Fri, Sep 09, 2011 at 12:17:15PM -0400, David Carson wrote:
> To that end, I installed 1.7.0-rc2 with a snapshot of our repository, so I
> could experiment and see for myself. I did a simple merge from one branch
> to another. I was disappointed to see that the same miscellaneous group of
> fil
We have a repository that is seriously cluttered with the svn:mergeinfo
property. I don't believe we ever used the buggy 1.5.x versions that added
the property erroneously (although I could be wrong). However, due to a lax
policy regarding where merges should occur, the property is now attached t
