Hi,
This has been brought up before but in a different context (
http://mail-archives.apache.org/mod_mbox/subversion-dev/201311.mbox/%3c20131107155018.gg10...@ted.stsp.name%3E
)
We maintain some vendor-like code on some branches that we periodically
want to merge into our development branch. The
On Thu, Aug 28, 2014 at 02:03:59PM -0700, Dan Ellis wrote:
> Hi,
>
> This has been brought up before but in a different context (
> http://mail-archives.apache.org/mod_mbox/subversion-dev/201311.mbox/%3c20131107155018.gg10...@ted.stsp.name%3E
> )
>
> We maintain some vendor-like code on some bran
On 28 Aug 2014, at 17:03, Dan Ellis wrote:
>
>
> We maintain some vendor-like code on some branches that we periodically
> want to merge into our development branch. The problem is that both in
> our development branch and in the vendor-like branch, we use subversion
> properties for some house ke
On Thu, Aug 28, 2014 at 2:27 PM, Stefan Sperling wrote:
> On Thu, Aug 28, 2014 at 02:03:59PM -0700, Dan Ellis wrote:
> > Hi,
> > Can anyone talk about the robustness of a diff/patch solution to merging
> on
> > text contents?
>
> It would work fine, except for tree changes (though 'svn merge' its
>
>
> I don't think this is a merge problem as much as a conflict resolution
> problem. Perhaps efforts would be a better invested in trying to improve
> the property conflict resolution mechanisms of 'svn resolve' to make
> your workflow easier?
>
> It sounds like if you'd be in less trouble if yo
On Thu, Aug 28, 2014 at 02:55:57PM -0700, Dan Ellis wrote:
> >
> >
> > I don't think this is a merge problem as much as a conflict resolution
> > problem. Perhaps efforts would be a better invested in trying to improve
> > the property conflict resolution mechanisms of 'svn resolve' to make
> > you
On Fri, Aug 29, 2014 at 2:14 AM, Stefan Sperling wrote:
> On Thu, Aug 28, 2014 at 02:55:57PM -0700, Dan Ellis wrote:
>
> > >
> > > It sounds like if you'd be in less trouble if you could 'revert'
> individual
> > > property changes to the working copy's BASE state independently of the
> > > textu
On Fri, Aug 29, 2014 at 03:40:38PM -0700, Dan Ellis wrote:
> On Fri, Aug 29, 2014 at 2:14 AM, Stefan Sperling wrote:
>
> > On Thu, Aug 28, 2014 at 02:55:57PM -0700, Dan Ellis wrote:
> >
> > > >
> > > > It sounds like if you'd be in less trouble if you could 'revert'
> > individual
> > > > propert
