Bazaar

Merge lp:~jr/bzr/317357-unchanged-commit-error into lp:bzr

  1. 317357-unchanged-commit-error
  2. Merge into bzr.dev
Proposed by Jonathan Riddell
Status: Merged
Approved by: Andrew Bennetts
Approved revision: no longer in the source branch.
Merged at revision: 5889
Proposed branch: lp:~jr/bzr/317357-unchanged-commit-error
Merge into: lp:bzr
Diff against target: 37 lines (+3/-2)
3 files modified
bzrlib/commit.py (+0/-1)
bzrlib/tests/blackbox/test_commit.py (+0/-1)
doc/en/release-notes/bzr-2.4.txt (+3/-0)
To merge this branch: bzr merge lp:~jr/bzr/317357-unchanged-commit-error
Reviewer Review Type Date Requested Status
Andrew Bennetts Approve
Review via email: mp+61261@code.launchpad.net

Commit message

Do not show exception to user on pointless commit error.

To post a comment you must log in.
Revision history for this message
Andrew Bennetts (spiv) wrote :

Hurrah!

review: Approve
Revision history for this message
Andrew Bennetts (spiv) wrote :

sent to pqm by email

Revision history for this message
Andrew Bennetts (spiv) wrote :

The joy of sprinting, it failed to land:

Conflicts during merge: Text conflict in doc/en/release-notes/bzr-2.4.txt

Revision history for this message
Jonathan Riddell (jr) wrote :

sent to pqm by email

Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/commit.py'
2--- bzrlib/commit.py 2011-05-14 21:02:06 +0000
3+++ bzrlib/commit.py 2011-05-18 08:06:15 +0000
4@@ -443,7 +443,6 @@
5 except Exception, e:
6 mutter("aborting commit write group because of exception:")
7 trace.log_exception_quietly()
8- note("aborting commit write group: %r" % (e,))
9 self.builder.abort()
10 raise
11
12
13=== modified file 'bzrlib/tests/blackbox/test_commit.py'
14--- bzrlib/tests/blackbox/test_commit.py 2011-04-18 03:15:03 +0000
15+++ bzrlib/tests/blackbox/test_commit.py 2011-05-18 08:06:15 +0000
16@@ -57,7 +57,6 @@
17 err,
18 DocTestMatches("""\
19 Committing to: ...
20-aborting commit write group: PointlessCommit(No changes to commit)
21 bzr: ERROR: No changes to commit.\
22 Please 'bzr add' the files you want to commit,\
23 or use --unchanged to force an empty commit.
24
25=== modified file 'doc/en/release-notes/bzr-2.4.txt'
26--- doc/en/release-notes/bzr-2.4.txt 2011-05-18 01:02:52 +0000
27+++ doc/en/release-notes/bzr-2.4.txt 2011-05-18 08:06:15 +0000
28@@ -89,6 +89,9 @@
29 reporting subdirectories that were tree references (in formats that
30 supported them). (John Arbash Meinel, #764677)
31
32+* Do not show exception to user on pointless commit error (Jonathan
33+ Riddell #317357)
34+
35 * ``WT.update_basis_by_delta`` no longer requires that the deltas match
36 the current WT state. This allows ``update_basis_by_delta`` to be used
37 by more commands than just commit. Updating with a delta allows us to