[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [PROPOSAL] Merging Improved

From: Sander Striker <striker_at_apache.org>
Date: 2003-04-14 02:21:14 CEST

> From: Tom Lord [mailto:lord@emf.net]
> Sent: Monday, April 14, 2003 2:26 AM
> > From: "Sander Striker" <s.striker@striker.nl>
>
> > [me:]
> >> [Where's transitive merge handling?!?!?]
>
> > Ah, you mean something like Example 2, M1? Or M4 (which resembles
> > your text above even more).
> >
> > Sander
> >
> > PS. I'm referring to the examples in the pdf attached to this message:
> > http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=35071
>
>
> Thanks. Yup.
>
> I didn't see it in the text so I was wondering if you were thinking
> about the need to diff and merge svn:merged* properties.....

We have to merge the svn:merged-from properties. This specific property
is going to be specially handled by the svn merge code. The generic
diff/merge code won't be touching it.

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 14 02:21:54 2003

This is an archived mail posted to the Subversion Dev mailing list.