Jump to content

Search the Community

Showing results for tags 'branch'.

  • 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 5 results

  1. I created my repository a few hours ago and I'm trying to sync it from local to cloud for the first time (I'm using distributed version control). When I first tried to push the outgoing changes, the Sync failed because I had to first pull the incoming changes. So I successfully did that, and then I tried pushing again. This time, however, the branch replication failed because "The source branch has two heads", and I should "Merge from cs:af2f3159... [name continues] to br:/main to unify the heads". The problem is that I can't seem to find this "cs:af2f3159" etc. head anywhere to merge it with br:/main. I already tried to merge changesets both from the Changesets screen and from the Branch Explorer, but I'm always told that "The merge search has finished; merge destination already contains source changes", with no conflicts to solve or changes to apply. This is how my my Branch Explorer looks like: Any help would be appreciated.
  2. Hello, in our setup we manually push selected branches from our premise server to the cloud. But we want to pull all branches from the cloud to our server. The processes run automatically via a timed batch script. My pull command looks like: cm pull "/main/dev@repo@org@cloud" repo@server:8087 I tried to use wildcards (*, %) like cm pull "/main/dev/*@repo@org@cloud" repo@server:8087 -------------------^ but nothing worked. Is there some way to pull the (child) branches recursively? I put "child" in parentheses, because we are fine with pulling all branches from the cloud (we just don't want to push everything there). The more complicated way I can think about would be: getting a list of all cloud branches and then pulling each branch separately. That would be weird and uncomfortable and I think there must be another way (GUI "sync" can do this, is there a log of commands called from the gui?). Thank you all
  3. Hello everyone! :) How can i set up exclusive checkouts for each branch of my project? Cause now i have a checkout for whole workspace :(
  4. Hi, we are looking for a way to list all changesets of a certain branch that have not been integrated into another branch. Our szenario is a beta deployment branch. There are a lot of changes directly made on that branch that are meant to be integrated into /main again. Other changes should not be integrated (workarounds etc.). We created a branch from /main that is used for this integration. The changes that have to be integrated are cherry picked from the beta deployment branch. We want to have a list of all changesets that are not merged in any way (merge or cp) from the beta deployment into the integration branch. I looked into the cm find examples on your homepage. I can detect branches that are not completely merged in terms of having changesets after the last regular merge. This does not fit in our scenario. Best regards Jan
  5. So we're having a small workflow issue when working with Unity and a series of xlinked projects. I'll explain the problem then what I think is the cause. When making a check in, quite often a branch will be made in one of the xlinks (as expected) but it won't actually have a change set checked in at the same time as the one in the master project. When performing a sync to other machines, this causes issues as the branch doesn't get replicated unless there is a changeset in it, and checking in and switching changesets will fail due to this empty branch being missing. So what I think is causing the issue, is there are a lot of files that get 'touched' by Unity, so Plastic adds them to the check in process, even though the file contents are identical (which you can check by opening a diff window for them). When Plastic goes through it's Check In process, it sees that an item in an xlink is modified, creates the branch on the xlink, then optimises the actual checkin because the files are identical, leaving the empty branch on the machine, but as a dependency for the master project. We can currently work around this by going back to the machine that has the empty branch, making an explicit change to a file and checking that in so that there is a change set, however this isn't an ideal workflow and we've come across this several times now. If you have any ideas on ways to prevent this, or if this seems like a bug and you need reproduction steps, please let me know. Thanks!
×
×
  • Create New...