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

Prevent overlapping with terminated branch #689

Merged
merged 2 commits into from Apr 25, 2017

Conversation

Projects
None yet
2 participants
@laerreal
Contributor

laerreal commented Apr 24, 2017

Tag overlapping prevention algorithm can cause an overlapping with terminated branch.
The reproducing script with explanation is added by this patch series. The scripts build the graph represented below.

before

After the bug is fixed the graph becomes as represented below.

after

Another kind of overlapping is seen (edges of branches b6 and b7). But it is up to other bug that is being investigated.

laerreal added some commits Apr 21, 2017

dag: prevent overlapping of a new branch and terminated one
Signed-off-by: Efimov Vasily <real@ispras.ru>
dag: add test reproducing branch overlapping
The explanation is in the script.

Signed-off-by: Efimov Vasily <real@ispras.ru>

davvid added a commit to davvid/git-cola that referenced this pull request Apr 25, 2017

Merge pull request git-cola#689 from laerreal/fixes
* laerreal/fixes:
  dag: prevent overlapping of a new branch and terminated one
  dag: add test reproducing branch overlapping

Signed-off-by: David Aguilar <davvid@gmail.com>

@davvid davvid merged commit 1c03a26 into git-cola:master Apr 25, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment