Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conflicts creating a repository after changing branches. #8

Closed
npasserini opened this issue May 11, 2016 · 3 comments
Closed

Conflicts creating a repository after changing branches. #8

npasserini opened this issue May 11, 2016 · 3 comments

Comments

@npasserini
Copy link
Contributor

We can reproduce it by changing pharo-git branch, and starting IceExamples exampleSynchronizer

exampleSynchronizer
    | repository changeSet |
    repository := Git new origin: '[email protected]:npasserini/pharo-git.git'.
    changeSet := IceRepositoryChangeSet fromRepository: repository.
    IceSynchronizer new
        changeSet: changeSet;
        openWithSpec.

I do not think it is a problem of the example, can happen in production code.
We should decide if we take the branch from the (pre)existing directory, use another directory or something smarter. Maybe we could let the user decide in each case.

On the other hand, if we removed the working copies from disk, this error would never happen.

@npasserini npasserini modified the milestone: 0.0.3 - Basic branching and merging May 11, 2016
@npasserini
Copy link
Contributor Author

Ask the user to make a decission, with options:

  1. override the existing repository and checkout the desired branch.
  2. keep both, so select another repository
  3. abort

@npasserini
Copy link
Contributor Author

Closed by mistake.

@npasserini npasserini reopened this May 26, 2016
@guillep
Copy link
Member

guillep commented Apr 6, 2018

This should not be valid anymore in the latest version. Iceberg shows that the image version is not in sync with the repository and shows several recovery strategies to the user.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants