~bzr-pqm/bzr/bzr.dev

Note potential improvements in knit adds.

added added

removed removed

457

order = topo_sort(graph.items())

458

pb = ui.ui_factory.nested_progress_bar()

459

try:

460

# make a versioned file with the following content:

461

# all revisions we have been asked to join

462

# all their ancestors that are *not* in target already.

463

# the immediate parents of the above two sets, with

464

# empty parent lists - these versions are in target already

465

# and the incorrect version data will be ignored.

466

# TODO: for all ancestors that are present in target already,

467

# check them for consistent data, this requires moving sha1 from

468

460

469

for index, version in enumerate(order):

461

470

pb.update('Converting versioned data', index, len(order))

462

471

target.add_lines(version,