Jump to content

Search the Community

Showing results for tags 'delete'.

  • Search By Tags

    Type tags separated by commas.
  • Search By Author

Content Type


Forums

  • Plastic SCM
    • General
    • Installation and configuration
    • Unity 3D
    • Plastic SCM on Mac
    • Plastic SCM on Linux
    • Gluon
    • Git interop
    • Integrations
    • Community Edition
    • Branching and merging
    • Announcements
  • Plastic SCM 4.0 Beta (Closed)
  • Plastic Cloud
    • General
    • Configuration
  • SemanticMerge
    • General
    • License
    • SCM's configuration
    • Share your experience!
    • External Parsers
  • GitJungle
  • Method History for Subversion
  • PlasticX Early Adopter Program's General Feedback
  • PlasticX Early Adopter Program's Issue Reporting
  • PlasticX Early Adopter Program's Feature Requests
  • PlasticX Early Adopter Program's Announcements

Find results in...

Find results that contain...


Date Created

  • Start

    End


Last Updated

  • Start

    End


Filter by number of...

Joined

  • Start

    End


Group


AIM


MSN


Website URL


ICQ


Yahoo


Jabber


Skype


Location


Interests

Found 2 results

  1. We have a file that gets automatically generated but of which we also need to track the changes (this is a specific case where the changes in the generated file are actually interesting). Usually, the file simply gets overwritten during recreation. But we found out that over time, this keeps stuff in the file that shouldn't be there. So we deleted and recreated it. Unfortunately, Plastic seems to try to be smart about this, recognizes that the file was deleted and recreated, and puts it into both, "Deleted items" and "Added and private items". Very unfortunately, the result is that we lose the history, which is the whole point of using version control for this file in first place. I have tried using cm mv to make Plastic understand that hey, I want continuity of this file but it complains that I can't move a file to itself, which I can agree with. So how can I make Plastic detect the actual changes in the file instead of deleting / recreating it and wiping the history? Btw, this is a text file and marked as such.
  2. I'm familiar with other SCM but just learning how to use Plastic - specifically the Gluon frontend. During our tests we engineered a situation where a file had been checked-out and changed by A and then deleted by B. As expected this leads to a conflict in Gluon when A attempts to check-in the changed file. What are the options allowed by Gluon to solve this conflict? We are able to lose the local changes and have the file remain deleted but is it possible to override the deletion with the local content changes and if so how?
×
×
  • Create New...