Rev 3384: rewrap in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_differences
John Arbash Meinel
john at arbash-meinel.com
Tue Apr 22 21:37:30 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_differences
------------------------------------------------------------
revno: 3384
revision-id: john at arbash-meinel.com-20080422203133-xra4zdxr7g5jvlcq
parent: john at arbash-meinel.com-20080422203057-a907ny2ytrw008c7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: find_differences
timestamp: Tue 2008-04-22 15:31:33 -0500
message:
rewrap
modified:
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
-------------- next part --------------
=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py 2008-04-22 20:30:57 +0000
+++ b/bzrlib/status.py 2008-04-22 20:31:33 +0000
@@ -172,10 +172,11 @@
merged_graph = {}
parent_map = graph.get_parent_map(merge_extra)
for merge in merge_extra:
- if merge not in parent_map: # The revision does not exist in the repository
+ if merge not in parent_map: # ghost
merged_graph[merge] = []
else:
- merged_graph[merge] = [p for p in parent_map[merge] if p in merge_extra]
+ merged_graph[merge] = [p for p in parent_map[merge]
+ if p in merge_extra]
sorter = tsort.MergeSorter(merged_graph, merge)
# Get a handle to all of the revisions we will need
width = osutils.terminal_width()
More information about the bazaar-commits
mailing list