[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: svn-buildpackage etc., mergeWithUpstream, and dpatch/quilt/cdbs again

On Thursday 17 May 2007 05:12:52 Magnus Holmgren wrote:
> On Wednesday 16 May 2007 14:52, Marcus Better wrote:
> > Magnus Holmgren wrote:
> > > Now, how do you combine these? Several people have thought: "The VCS
> > > can handle the changesets. Putting patches under VCS is silly!"
> >
> > I fully agree. Unfortunately Subversion doesn't make it easy for you.
> > You can keep your "patches" in different "feature branches", but it
> > gets messy since Subversion doens't keep track of merges.
> Is there any fundamental misdesign in Subversion that prevents that from
> being implemented somewhere in the future?

No, merge tracking has been in the Subversion roadmap for a long time, but 
has been lower priority than other things. However, merge tracking is now 
one of the highest priorities. Basic merge tracking is scheduled to be in 
the next release; more enhancements will follow.

Wesley J. Landaker <wjl@icecavern.net> <xmpp:wjl@icecavern.net>
OpenPGP FP: 4135 2A3B 4726 ACC5 9094  0097 F0A9 8A4C 4CD6 E3D2

Attachment: pgpHa76qKE6in.pgp
Description: PGP signature

Reply to: