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

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

Le jeudi 17 mai 2007 à 13:12 +0200, Magnus Holmgren a écrit :
> 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?

You can use one of the svnmerge scripts instead of "svn merge" to do
things the git way.

: :' :      We are debian.org. Lower your prices, surrender your code.
`. `'       We will add your hardware and software distinctiveness to
  `-        our own. Resistance is futile.

Attachment: signature.asc
Description: Ceci est une partie de message =?ISO-8859-1?Q?num=E9riquement?= =?ISO-8859-1?Q?_sign=E9e?=

Reply to: