Results 1 to 6 of 6

Thread: Subversion help needed!

  1. #1
    Join Date
    Apr 2009
    Location
    Toronto
    Beans
    188
    Distro
    Ubuntu Gnome 14.04 Trusty Tahr

    Subversion help needed!

    Hi,
    I write Wordpress plugins, which use the Subversion platform for version control. Hopefully those on the forum can help me with the problem I'm having now.

    The SVN client says my working copy is locked, but I can't figure out how to unlock it. I've tried
    Code:
    svn cleanup
    but that fails, and
    Code:
    svn unlock
    doesn't work either. I think the problem started when I added a file to the copy, then tried to rename it.

    Any suggestions? I can't make any updates to the plugins until this is fixed.
    Mechanical engineer and software developer
    File Server - Nimitz - Ubuntu 12.04, 9.25TB
    Workstation - 4.0GHz/watercooled/12GB RAM/Samsung 840 SSD
    http://www.wesg.ca - Macs and more, http://www.yardbot.ca - Robot project

  2. #2
    Join Date
    Aug 2008
    Beans
    56
    Distro
    Kubuntu Development Release

    Re: Subversion help needed!

    Did you rename the file in the FS or using SVN move operation?

  3. #3
    Join Date
    Apr 2009
    Location
    Toronto
    Beans
    188
    Distro
    Ubuntu Gnome 14.04 Trusty Tahr

    Re: Subversion help needed!

    First I did FS, then when I realized the problem, I renamed it back, then tried SVN. Right now the trunk is behaving properly, but the tags folder is locked (still has the wrong file name).

    When I issue the command
    Code:
    svn cleanup
    this is the output
    Code:
    svn: In directory 'tags/2.6.1'
    svn: Error processing command 'committed' in 'tags/2.6.1'
    svn: Working copy 'tags' locked
    svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
    Last edited by wesg; August 9th, 2009 at 10:13 PM. Reason: command output
    Mechanical engineer and software developer
    File Server - Nimitz - Ubuntu 12.04, 9.25TB
    Workstation - 4.0GHz/watercooled/12GB RAM/Samsung 840 SSD
    http://www.wesg.ca - Macs and more, http://www.yardbot.ca - Robot project

  4. #4
    Join Date
    Apr 2009
    Location
    Toronto
    Beans
    188
    Distro
    Ubuntu Gnome 14.04 Trusty Tahr

    Re: Subversion help needed!

    I was able to unlock the directories (there is a file called "locked" inside a hidden svn directory) but now I have a problem in that a file in the trunk is a different name than the one in the tag directory.

    How can I remedy this situation?
    Mechanical engineer and software developer
    File Server - Nimitz - Ubuntu 12.04, 9.25TB
    Workstation - 4.0GHz/watercooled/12GB RAM/Samsung 840 SSD
    http://www.wesg.ca - Macs and more, http://www.yardbot.ca - Robot project

  5. #5
    Join Date
    Jul 2005
    Location
    St Albans, UK
    Beans
    259
    Distro
    Ubuntu Development Release

    Re: Subversion help needed!

    Have you tried using
    Code:
    svn move
    to rename the file with the wrong name?
    No man earns punishment, no man earns reward. Free your mind of the idea of deserving, the idea of earning, and you will begin to be able to think.
    Ursula LeGuin, The Dispossessed.
    Member of BOINC Team Ubuntu, spare cpu cycles benefitting humanity.

  6. #6

    Re: Subversion help needed!

    Re checkout the working copy, manually merge the differances and be sure to use SVN's copy/move/delete etc insted of the OS in the future.
    im dyslexic, please don't comment on my spelling
    blender 3d artist, visit my portfolio
    Quad-Ren, Open source, resolution independent 2D graphics engine
    Screen space is a precious resource, don't waste it

Bookmarks

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •