Re: [PATCH v2 0/3] git-svn: use YAML format for mergeinfo cache when possible

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jonathan Nieder <jrnieder@xxxxxxxxx> wrote:
> Eric Wong wrote:
> > These should die on errors, right?
> 
> Yep, they do.  I didn't bother doing the CARP_NOT thing --- let's wait
> for a bug report or rainy day and then handle errors properly (by
> invalidating the cache when appropriate).

OK.

> Patches 1-2 are independent from patch 3.  I'm sending them this way
> for no particular reason.
> 
> Thoughts of all kinds welcome, as usual.

Thanks!  I only had a trivial conflict with 2/3, but fixed it,
signed-off and pushed to master of git://bogomips.org/git-svn

> Jonathan Nieder (3):
>   git-svn: make Git::SVN::Editor a separate file
>   git-svn: make Git::SVN::RA a separate file

2/3 had a conflict with commit c26ddce86d7215b4d9687bd4c6b5dd43a3fabf31
which I resolved by hand
(git-svn: platform auth providers are working only on 1.6.15 or newer)

--- a.mbox	2012-06-10 08:58:19.000000000 +0000
+++ b.mbox	2012-06-10 08:58:23.000000000 +0000
@@ -64,7 +64,7 @@
 -
 -	# earlier 1.6.x versions would segfault, and <= 1.5.x didn't have
 -	# this function
--	if (::compare_svn_version('1.6.12') > 0) {
+-	if (::compare_svn_version('1.6.15') >= 0) {
 -		my $config = SVN::Core::config_get_config($config_dir);
 -		my ($p, @a);
 -		# config_get_config returns all config files from
@@ -688,7 +688,7 @@
 +
 +	# earlier 1.6.x versions would segfault, and <= 1.5.x didn't have
 +	# this function
-+	if (::compare_svn_version('1.6.12') > 0) {
++	if (::compare_svn_version('1.6.15') >= 0) {
 +		my $config = SVN::Core::config_get_config($config_dir);
 +		my ($p, @a);
 +		# config_get_config returns all config files from
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]