Index: /devel/pb/lib/ProjectBuilder/CMS.pm
===================================================================
--- /devel/pb/lib/ProjectBuilder/CMS.pm	(revision 1208)
+++ /devel/pb/lib/ProjectBuilder/CMS.pm	(revision 1302)
@@ -488,5 +488,5 @@
 my $vcscmd = pb_cms_cmd($scheme);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
 	pb_system("$vcscmd up $dir","Updating $dir ");
 } elsif (($scheme eq "flat") || ($scheme eq "ftp") || ($scheme eq "http"))   {
@@ -515,5 +515,5 @@
 $msg = "Project $ENV{PBPROJ} creation" if (defined $pbinit);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
 	pb_system("cd $dir ; $vcscmd ci -m \"$msg\" .","Checking in $dir ");
 } elsif (($scheme eq "flat") || ($scheme eq "ftp") || ($scheme eq "http"))   {
@@ -537,5 +537,5 @@
 my $vcscmd = pb_cms_cmd($scheme);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
 	pb_system("$vcscmd add $f","Adding $f to VCS ");
 } elsif (($scheme eq "flat") || ($scheme eq "ftp") || ($scheme eq "http"))   {
@@ -560,5 +560,5 @@
 my $l = undef;
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
 	open(PIPE,"$vcscmd diff $dir |") || die "Unable to get $vcscmd diff from $dir";
 	$l = 0;
@@ -715,5 +715,8 @@
 	# which needs it to trigger correct behaviour
 	$uri =~ s/^svk://;
-	if ($cmsurl ne $uri) {
+	if (($scheme2 =~ /^git/) || ($scheme2 =~ /^hg/)) {
+		# These VCS manages branches internally not with different tree structures
+		# Assuming it's correct for now.
+	} elsif ($cmsurl ne $uri) {
 		# The local content doesn't correpond to the repository
 		pb_log(0,"ERROR: Inconsistency detected:\n");