Unverified Commit e473d2ae authored by Sébastien Eustace's avatar Sébastien Eustace
Browse files

Fix conflict resolution in mixology

parent f75b1cb7
Loading
Loading
Loading
Loading
+0 −0

Empty file added.

+0 −0

Empty file added.

+3 −1
Changes for poetry/mixology/dependency_graph.py: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -84,7 +84,9 @@ class DependencyGraph:
        dot_edges = []

        for n, v in self.vertices.items():
            dot_vertices.append('  {} [label="{}|{}"]'.format(n, n, v.payload))
            dot_vertices.append(
                '  {} [label="{}|{}"]'.format(n, n, v.payload or '')
            )
            for e in v.outgoing_edges:
                label = e.requirement
                dot_edges.append(
+2 −3
Changes for poetry/mixology/graph/add_edge_no_circular.py: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class AddEdgeNoCircular(Action):
    def down(self, graph):
        edge = self.make_edge(graph)
        self._delete_first(edge.origin.outgoing_edges, edge)
        self._delete_first(edge.origin.incoming_edges, edge)
        self._delete_first(edge.destination.incoming_edges, edge)

    def make_edge(self, graph):
        return Edge(
@@ -55,5 +55,4 @@ class AddEdgeNoCircular(Action):
        except ValueError:
            return

        if index != -1:
            elements.pop(index)
        del elements[index]
+1 −2
Changes for poetry/mixology/graph/delete_edge.py: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -55,5 +55,4 @@ class DeleteEdge(Action):
        except ValueError:
            return

        if index != -1:
            elements.pop(index)
        del elements[index]
Loading