maven-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Alison Winters (JIRA)" <j...@codehaus.org>
Subject [jira] Commented: (SCM-406) scm tag does not work with Subversion 1.5.1
Date Thu, 27 Nov 2008 22:46:19 GMT

    [ http://jira.codehaus.org/browse/SCM-406?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=155696#action_155696
] 

Alison Winters commented on SCM-406:
------------------------------------

I think Torsten is on the right track here.  If you svn update the directory before tagging
it will work by using the current directory (".").  To protect against the scenario where
someone else might have updated trunk in between i think we could look at the following fix
(sorry for pseudo code, i'm not familiar enough with the Maven internals to provide a real
patch).

{code}
boolean forceUpdate = getForceUpdateArgument();
int revision = getHeadRevision();
if (!forceUpdate && hasChanges(revision)) {
  println("Head revision has the following changes, do you wish to update?");
  printChanges(revision);
  if (!yesNo()) {
    return;
  }
}
update(revision);
doTag(".");
{code}

There is still a tiny race condition where someone checks something into head in between when
you get the latest revision number and when you hit "yes" in non-force-update mode, but if
that fails then it's no worse than the situation right now.  This will at least fix the case
for most of us who have segmented trees where it is very unlikely we will be tagging something
from a branch that anyone else is simultaneously editing.



> scm tag does not work with Subversion 1.5.1
> -------------------------------------------
>
>                 Key: SCM-406
>                 URL: http://jira.codehaus.org/browse/SCM-406
>             Project: Maven SCM
>          Issue Type: Bug
>          Components: maven-scm-provider-svn
>    Affects Versions: 1.0
>            Reporter: James William Dumay
>             Fix For: 1.1.1
>
>
> scm:checkin does not work with Subversion 1.5.1
> On release:perform (which I assume calls scm:checkin) the following error occurs:
> {code}
> svn: File '/svn/private/atlassian/confluence/tags/confluence-project-2.10-m1/conf-acceptance-test/pom.xml'
already exists
> {code}
> Using subversion 1.4.x is a good enough workaround.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

Mime
View raw message