Re: On using svn for submitting patches

On Fri, Oct 10, 2003 at 09:44:50AM -0400, John Peacock wrote:
[sni]
> I create a branch (or several) for my development work, to which I
> merge from the trunk occasionally. When I am ready to submit a patch,
> I make sure I merge from the trunk one last time (to test that the
> patch is not going to break anything), then I do a diff from the HEAD
> of the branch to the HEAD of the trunk, and this is what should apply.
[snip]

Shouldn't that be:
[...]
* merge from trunk@HEAD (where HEAD == X) one last time
* diff from HEAD of branch to trunk@X

Otherwise there's a race. Something could change on trunk between the
last two steps which would cause you to revert stuff you shouldn't.

(This is all assuming trunk changes automatically, which is probably
wrong. I suppose you probably run apc2svn to update the stuff in
trunk manually?)

-- 
Michael Wood <mwood@its.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org