@@ -106,6 +106,8 @@ os::cmd::try_until_success 'oc label pod/hello-openshift acustom=label' # can ra

 os::cmd::expect_success_and_text 'oc describe pod/hello-openshift' 'acustom=label'

 os::cmd::try_until_success 'oc annotate pod/hello-openshift foo=bar' # can race against scheduling and status updates

 os::cmd::expect_success_and_text 'oc get -o yaml pod/hello-openshift' 'foo: bar'

+os::cmd::expect_failure_and_not_text 'oc annotate pod hello-openshift description="test" --resource-version=123' 'may only be used with a single resource'

+os::cmd::expect_failure_and_text 'oc annotate pod hello-openshift hello-openshift description="test" --resource-version=123' 'may only be used with a single resource'

 os::cmd::expect_success 'oc delete pods -l acustom=label --grace-period=0'

 os::cmd::expect_failure 'oc get pod/hello-openshift'

 echo "label: ok"

@@ -190,11 +190,6 @@ func (o AnnotateOptions) Validate(args []string) error {

 		return err

 	}

-	// only apply resource version locking on a single resource

-	if len(o.resources) > 1 && len(o.resourceVersion) > 0 {

-		return fmt.Errorf("--resource-version may only be used with a single resource")

-	}

-

 	return nil

 }

@@ -205,6 +200,17 @@ func (o AnnotateOptions) RunAnnotate() error {

 		return err

 	}

+	var singularResource bool

+	r.IntoSingular(&singularResource)

+

+	// only apply resource version locking on a single resource.

+	// we must perform this check after o.builder.Do() as

+	// []o.resources can not not accurately return the proper number

+	// of resources when they are not passed in "resource/name" format.

+	if !singularResource && len(o.resourceVersion) > 0 {

+		return fmt.Errorf("--resource-version may only be used with a single resource")

+	}

+

 	return r.Visit(func(info *resource.Info, err error) error {

 		if err != nil {

 			return err