Merge lp:~federicoculloca/bzr/bug317357 into lp:bzr
Proposed by
Federico Culloca
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 5768 | ||||
Proposed branch: | lp:~federicoculloca/bzr/bug317357 | ||||
Merge into: | lp:bzr | ||||
Diff against target: |
26 lines (+5/-2) 2 files modified
bzrlib/builtins.py (+4/-1) bzrlib/tests/test_trace.py (+1/-1) |
||||
To merge this branch: | bzr merge lp:~federicoculloca/bzr/bug317357 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Needs Fixing | ||
Andrew Bennetts | Pending | ||
Review via email: mp+56605@code.launchpad.net |
This proposal supersedes a proposal from 2011-04-06.
Description of the change
Corrected what was unintentionally changed.
To post a comment you must log in.
Thanks for the patch.
Unfortunately, this doesn't appear to fix the linked bug, which is that “aborting commit write group: PointlessCommit(No changes to commit)” is shown to the user, rather than just the following line (“bzr: ERROR: no changes to commit…”)
You're probably right that it's worth suggesting “bzr add” to the user, not just “bzr commit --unchanged”. You have a typo in your suggested text, and I think it can be more concise and clearer by directly saying “bzr add”. Here's my idea:
“Please 'bzr add' the files you want to commit, or use --unchanged to force an empty commit.”
What do you think?