← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Committer: Aaron Bentley
Date: 2006-05-19 04:00:05 UTC
mto: (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1551.19.24 Aaron's mergeable stuff)
mto: This revision was merged to the branch mainline in revision 1719.
Revision ID: aaron.bentley@utoronto.ca-20060519040005-a30f7a0983c1fc03

Improved help for remerge and merge

files removed:
bzrlib/tests/workingtree_implementations/test_is_ignored.py

files modified:
NEWS

bzrlib/add.py

bzrlib/benchmarks/bench_add.py

bzrlib/builtins.py

bzrlib/bzrdir.py

bzrlib/inventory.py

bzrlib/log.py

bzrlib/msgeditor.py

bzrlib/tests/test_log.py

bzrlib/tests/test_workingtree.py

bzrlib/tests/workingtree_implementations/__init__.py

bzrlib/workingtree.py

Show diffs side-by-side

added added

removed removed

bzrlib/builtins.py

1396

1396

igns += '\n'

1397

1397

igns += name_pattern + '\n'

1398

1398

1399

f = AtomicFile(ifn, 'wt')

1400

1399

try:

1400

f = AtomicFile(ifn, 'wt')

1401

1401

f.write(igns.encode('utf-8'))

1402

1402

f.commit()

1403

1403

finally:

Older »