Jump to content
Sign in to follow this  
Sam

Undo gitsync in Plastic SCM

Recommended Posts

Hi everybody,

I'm afraid I did a big mistake on one of my repo.

I have a repo called "My_repo_A" which has a XLinked sub repo called "My_repo_A_shares". This sub repo "My_repo_A_shares" is synced with a repo on github.

But tonight, after a hard work week, I synced by mistake the parent repo "My_repo_A" with the same repo on github. That resulted in a warning like "the branches have to be merged before being able to push with gitsync again ...". Hopefully there are no problems on github, but in plastic a lot of commits are duplicated with different guid, and branches have two heads ...

So ... the winner is me ! I know ... but is there a way to cancel a gitsync ?

Thanks a lot for your help.

Share this post


Link to post
Share on other sites

Hi,

If you get duplicated items and the repo history is broken, I would remove this repo and perform a new clean gitsync to recover the right history. As soon as the Github history is ok, you should be able to sync to a new repo.

Regards,

Carlos.

Share this post


Link to post
Share on other sites

Hi Carlos,

The sub-repo synced with github is OK, but it's the "parent" plastic repo that has been accidentally sinced with github mirror image of its child repo. There is no github image of the parent repository.

Perhaps there's a way to detect all the commit that come from gitsync and delete them ?

Sincerly

Sam T.

Share this post


Link to post
Share on other sites

Hi,

If you open the branch explorer, are you able to determine the duplicated changesets? How many duplicated changesets are there? It may be difficult to remove all of them one by one :$

Don't you have repo backups?

Also, I don't understand how this scenario could happen. For the GitSync operation, Plastic uses a local mappings folder. This way if a PlasticRepo1 is synced with GitRepo1 and then you try to sync the same repo against GitRepo2, Plastic doesn't allow it to prevent rewriting the history or duplicating changesets.

Once you sync a Plastic repo with a Git repo, you cannot choose to sync a different one.

Regards,

Carlos.

Share this post


Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...
Sign in to follow this  

×
×
  • Create New...