subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dan Ellis <danelli...@gmail.com>
Subject Re: svn merge --ignore-properties
Date Fri, 29 Aug 2014 22:40:38 GMT
On Fri, Aug 29, 2014 at 2:14 AM, Stefan Sperling <stsp@elego.de> 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
> > > textual
> > > changes, perhaps as a batch operation. There's no technical reason why
> the
> > > conflict resolver couldn't be taught to make this easy but it's not
> > > implemented
> > >
> >
> >
> > I just re-read this Stefan and think I get what you are referring to.
> Are
> > you suggesting an additional parameter(s) to resolve that would allow
> > accepting of a specific property or properties as a whole instead of a
> > whole file including properties?
>
> Yes.
>
> > Something like "svn resolve foo.c --accept working --properties-only"?
> >  That could work well.
>
> Yes, and it could also be dealt with at the interactive conflict prompt.
> E.g. it could allow the user to say "resolve this property to theirs-full
> and apply that resolution to any other conflicted properties with the
> same name" which is currently not possible.
>
> The resolver will only deal with conflicted properties.
> If you also want to keep non-conflicted properties unchanged by the
> merge, then 'svn revert' could likewise be extended with an interface
> to achieve that.
>

Does this need to go over to the dev list for other developers to
review/comment on?

Thanks,
Dan

Mime
View raw message