[Adium-devl] Creating a patch... question about revisions in Subversion
prh at boredzo.org
Sun Nov 12 16:40:02 UTC 2006
On Nov 12, 2006, at 08:29:05, Chris Stewart wrote:
> I currently have revision 18215 so I can code against that. If I
> get my code working and tested locally against this revision, I
> should then get latest from svn and test against the latest version
> of the trunk. Is that right?
> Will my changes be overwritten if I run the "svn update" command in
No; svn will perform a three-way merge in that case.
You may end up with conflicts, in which case you'll get lines like
this in the output from svn up and svn st:
(This is fairly rare nowadays, but does still happen.)
In that case, look for lines like these:
These correspond to the files AISandwichMaker.m.42 (i.e. HEAD) and
AISandwichMaker.m.mine (what you had before you upped), respectively.
Once you've resolved all the conflicts, you'll need to do this:
svn resolved AISandwichMaker.m
Then, to generate the patch:
svn diff | bzip2 > TastySandwiches.diff.bz2
Send us TastySandwiches.diff.bz2.
And yes, “tasty sandwiches” is an in-joke. :)
\ Peter Hosey / prh at boredzo.org
PGP public key ID: 7AB26BAD (since 2006-01-01)
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 186 bytes
Desc: This is a digitally signed message part
More information about the Adium-devl