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

Re: svn1.5 team process and using merge reintegrate

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 19 Aug 2008 10:57:44 -0400

On Mon, Aug 18, 2008 at 11:11 PM, Aaron R> <antamiga_at_gmail.com> wrote:

> Thanks for the great suggestion. Once I read it I realized how obvious it
> was and how much sense it made.
> If you can humor me and give any insight into this minor change to doing
> things, I'd really appreciate it.
> What trouble would inexperienced developers get themselves into by doing
> either of the following:
> Case 1:
> - Dev A finishes SCR 10 and then starts another one
> - CM is busy with other stuff and doesn't merge SCR 10 to the mainline right
> away
> - Dev A needs the work which was done on the other SCR and so does a merge
> from SCR 10 to SCR 17
> - CM rolls SCR10 into the mainline
> - Dev A finishes SCR17 and updates from the mainline (Could be a problem
> here?)

Yes, I believe it would try to merge in the revision from trunk when
SCR10 was merged to trunk.

> - Dev A tells CM SCR 17 is ready to get merged to the mainline (CM might
> have an issue here?)

This should not be an issue, because the --reintegrate merge is
working off a diff of the two paths, not the revisions.

> Case 2:
> - Roughly the same as above, but throw in Dev B who needs an unreleased SCR
> from Dev A

Not sure how that is different. But suppose SCR10 is merged into
SCR17 and then SCR17 is merged into trunk. This means trunk also has
what was in SCR10. SVN is smart enough in this scenario, you try to
merge SCR10 to trunk, that it knows about the revisions from SCR10
that it already has.

> It seems like the best development flow would be to keep from cross branch /
> SCR merging. That would provide consistency in changes flowing 'up' from
> the SCR branches and then down into newer SCR areas.

I agree with that.

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-19 16:58:18 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.