Breezy

Merge lp://qastaging/~jelmer/brz/amend into lp://qastaging/brz

  1. amend
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Needs review
Proposed branch: lp://qastaging/~jelmer/brz/amend
Merge into: lp://qastaging/brz
Diff against target: 323 lines (+106/-35)
6 files modified
breezy/builtins.py (+30/-11)
breezy/commit.py (+28/-14)
breezy/msgeditor.py (+11/-3)
breezy/mutabletree.py (+8/-6)
breezy/tests/blackbox/test_commit.py (+26/-1)
doc/en/release-notes/brz-3.1.txt (+3/-0)
To merge this branch: bzr merge lp://qastaging/~jelmer/brz/amend
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+368874@code.qastaging.launchpad.net

Commit message

Add a --amend option to commit.

Description of the change

Add a --amend option to commit.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

All looks pretty sane. Adding new positional args can lead to annoying compat bugs, but `make_commit_message_template_encoded()` is presumably not widely used. Could probably do with some more focused tests for this later, but for now just see one inline nit.

review: Approve
Reply
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/373/

Reply
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/748/

Reply
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/994/

Reply

Unmerged revisions

6780. By Jelmer Vernooij

Fix docstring.

6779. By Jelmer Vernooij

Fix up tests for amend.

6778. By Jelmer Vernooij

Use WorkingTree.update during amend.

6777. By Jelmer Vernooij

merge trunk.

6776. By Jelmer Vernooij

Merge trunk.

6775. By Jelmer Vernooij

Add tests for amend.

6774. By Jelmer Vernooij

Merge lock context branch.

6773. By Jelmer Vernooij

Add --amend option to commit.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches