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

Re: (proposal) Subverion 1.0 date: 23 Feb 2004

From: <kfogel_at_collab.net>
Date: 2004-01-08 23:53:33 CET

Greg Stein <gstein@lyra.org> writes:
> > Oh, regarding merging: I think it'll be easier if one person does it.
> > I'd like to be that person. My plan is to apply committed changes
> > roughly in order (to avoid spurious conflicts), then take changes from
> > issues, and commit the whole shebang in one commit. This is okay
> > because we already *have* the changesets in all cases -- either as
> > revisions, or as patches. That way I can do my 'make check's once.
>
> Not the patches. Those are not available as changesets within _source_
> _control_. I don't want to say "oh, but that change is over in IZ."
>
> IMO, each IZ patch that is being held for "only apply to trunk if also
> applied to 1.0" should be applied to one of the branches first, then
> merged over. IMO again, that should be trunk first, then port over to the
> stabilization branch (as part of your big mother merge).
>
> Each changeset should be in source control, then ported over. As you said:
> if you need to make an adjustment, then that "should" be a separate commit
> so the tweaked changeset is available.

Ahhh. Good distinction.

Okay, then I'll do patches one-per-commit (and agree that trunk first
is preferable).

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 9 00:47:58 2004

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