← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Moved Outline.txt into BRANCH.TODO.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
159
159
 
160
160
 
161
161
def _resolve_interactive(tree, path):
162
 
    import sys # TEMPORARY
163
162
    tree.lock_tree_write()
164
163
    try:
165
164
        tree_conflicts = tree.conflicts()
171
170
        # FIXME: we should really do a loop below as some paths may be involved
172
171
        # in several conflicts but it's not yet clear how we will handle that.
173
172
        c = selected[0]
 
173
        import sys # TEMPORARY
174
174
        action_name = sys.stdin.readline()
175
175
        action_name = action_name.rstrip('\n')
176
176
        # Crude exit