On Tue, 2008-11-18 at 09:18 -0800, David Glasser wrote:
> On Tue, Nov 18, 2008 at 7:57 AM, Mark Phippard <markphip_at_gmail.com> wrote:
> > On Tue, Nov 18, 2008 at 10:49 AM, Paul Burba <ptburba_at_gmail.com> wrote:
> >> B) Merge the diff between 'trunk' and 'branch's youngest common
> >> ancestor and 'branch_at_r4', i.e. TRUNK_URL_at_1 BRANCH_URL_at_4 to 'trunk'.
> >>
> >> The current behavior is 'B'. Note that there is the possibility of a
> >> conflict between r3 and r4.
[...]
> > I agree with you that the current behavior is right.
>
> What he said.
FYI, I'll mention one of the reasons for allowing a reintegrate when the
branch isn't completely up to date. In a fast-moving project, if each
merge takes a finite amount of time (heh) and then you have to test the
result, you could be stuck with always being out of date by the time
you're ready to reintegrate. Our "commit" policy allows non-overlapping
parts of the tree to be out of date, which helps to solve this problem,
and it would be strangely inconsistent if our "merge [--reintegrate]"
did not.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-18 18:50:59 CET