[PATCH 1 of 3] update: add comments and test cases for updating across branches

Stuart W. Marks smarks at smarks.org
Tue Nov 3 11:47:12 CST 2009


Greg Ward wrote:
> Woo-hoo!  Great to see this getting improved -- thank you!

Thanks for your review and comments. Detailed replies below.

>> diff -r 57cee011ffcb -r 805cd5252f75 tests/test-update-branches
>> --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
>> +++ b/tests/test-update-branches        Sun Nov 01 20:31:39 2009 -0800
> 
> Minor error: the patch does not create the script as executable.  Make
> sure to pass '--git' to whatever diff command (email?) you used to
> create the patch!  Or configure 'diff.git = true' so you never get
> bitten by this again.

Oh yeah... the patches themselves are all git diffs in my patch queue, but 'hg 
email' regenerates the diffs as conventional diffs. Yet another case of silent 
loss of information. (Sigh.) There is more to be said and done on this topic, 
but perhaps not right now. Meanwhile, I'll reissue the patch series in git format.

>> @@ -0,0 +1,72 @@
>> +#!/bin/sh
> 
> The script contains bash-isms: e.g. on Ubuntu (where /bin/sh is not bash):

Ah, the old /bin/sh-is-dash-not-bash-on-Ubuntu trick. I fall for it every time. 
(Sorry about that, Chief.) Thanks for catching this and for suggesting changes 
to improve the portability and readability of the test script.

I'll incorporate these changes into the patch series when I repost it, which I 
hope to do later today.

s'marks


More information about the Mercurial-devel mailing list