Forums

[resolved] Code G on Subversion Upgrade? (2 posts)

  1. Novac
    Member
    Posted 4 years ago #

    When I upgraded my blogs this morning with subversion, I noticed that the response codes on just one of my blogs had something other that "U" at the beginning of the line:

    $ svn sw http://svn.automattic.com/wordpress/tags/2.3.3/
    U  wp-includes/gettext.php
    U  wp-includes/version.php
    U  wp-includes/pluggable.php
    G  xmlrpc.php
    U  wp-admin/install-helper.php

    Can someone tell me what this means? The rest of my blogs had U for every line. Thanks in advance.

  2. Otto
    Tech Ninja
    Posted 4 years ago #

    G = file was merged. Your version had some changes on its own and so it merged the two versions.

    I'd delete the file and rerun the svn to get the correct version.

Topic Closed

This topic has been closed to new replies.

About this Topic