Local repository copy doesn't match server after pull

XMLWordPrintable

    • Type: Bug
    • Resolution: Not a bug
    • Priority: High
    • None
    • Affects Version/s: 1.9.3.1
    • Component/s: Git
    • None
    • Environment:

      Mac OSX 10.9.3, using standalone SourceTree

      I don't know what to tell you about how this happened but you need to know about it and it doesn't increase my confidence in SourceTree.

      I came in this morning and did a pull to bring in all recent changes. Checking my code I found a file (stored procedure st_sp_fec_timer_read) where the version in my repository wasn't the same that I had pushed yesterday. I know the changes I made were there because I was using the new version of the procedure in development.

      I checked by locating a commit containing the file (searched for "timer" under "File Changes") and then checking its log.

      The log shows two entries:

      • The original log entry on 5/29/14 12:29:49pm when the file was first added – the entire file is the "hunk".
      • The next log entry on 6/2/14 2:37:10pm where I pushed a change – the changes I made were the "hunk" showing that the old code was replaced by my code.

      No other log entries appear for the file at all. Mine is the last entry

      Yet the copy that appears on my local disk is now the old version. Refer to the attached images.

        1. Finder.png
          Finder.png
          311 kB
        2. SourceTree log.png
          SourceTree log.png
          509 kB
        3. st_sp_fec_timer_read.png
          st_sp_fec_timer_read.png
          523 kB

            Assignee:
            Unassigned
            Reporter:
            Rod Barnes
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved: