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

Re: Merger not Merging -- What I would like a merge process to do.

From: Brass Tilde <brasstilde_at_insightbb.com>
Date: 2005-01-24 18:53:46 CET

> There you go, you just answered your own question.

Sometimes it just takes me a while. :)

> If the branch changes have nothing to do with the deleted class, then
> there will be no problems merging thoes changes to a working copy that
> has the class missing. If the branch changes *do* talk about the
> class, then you will definitely get some conflicts merging to the
> working copy.

> Will the patch apply cleanly to your latest code? The answer is: it
> completely depends on the patch, and it also depends on how your
> software has changed over the last two weeks.
>
> * If the patch tries to change files that no longer exist, you'll
> get a conflict.

See, when you lay it out that way, it makes much more sense. (If I missed
that type of explanation elsewhere in the discussion, sorry.)

Thanks.
Brad

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 24 18:56:14 2005

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