~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Lalo Martins
  • Date: 2005-09-15 15:16:12 UTC
  • mfrom: (1185.1.18)
  • mto: (1185.1.22)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050915151611-86c5de4298bb71f9
merging from integration again.

This is a "checkpoint" commit; the tests don't actually pass, but all the
really hard stuff has been merged (in particular, Aaron's new ancestor:
namespace was moved to revisionspec).

Show diffs side-by-side

added added

removed removed

Lines of Context:
248
248
        if not work_tree.has_id(file_id):
249
249
            if verbose:
250
250
                print('deleted %s%s' % (path, kind_marker(entry.kind)))
251
 
                any_changes = True
 
251
            any_changes = True
252
252
            mutter("    file is missing, removing from inventory")
253
253
            missing_ids.append(file_id)
254
254
            continue
310
310
            else:
311
311
                print 'renamed', marked
312
312
                any_changes = True
313
 
                        
 
313
        elif old_ie != entry:
 
314
            any_changes = True
 
315
 
314
316
    return missing_ids, inv, any_changes
315
317
 
316
318