Code G on Subversion Upgrade?

  • Resolved Novac

    (@novac)


    16 years, 10 months 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 https://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.

Viewing 1 replies (of 1 total)
  • Moderator Samuel Wood (Otto)

    (@otto42)

    www.remarpro.com Admin

    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.

Viewing 1 replies (of 1 total)
  • The topic ‘Code G on Subversion Upgrade?’ is closed to new replies.