[Adium-devl] Creating a patch... question about revisions in Subversion

[Peter Hosey]

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?

Yup.

> Will my changes be overwritten if I run the "svn update" command in  
> Terminal?

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:

C      AISandwichMaker.m

(This is fairly rare nowadays, but does still happen.)

In that case, look for lines like these:

<<<<<<<< .r42
	[self makeSandwich:AIUglySandwich];
========
	[self makeSandwich:AITastySandwich];
 >>>>>>>> .mine

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:

cd top-level-of-Adium-checkout
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...
Name: PGP.sig
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20061112/3cf21c22/attachment.sig>