Merge lp://staging/~a-s-usov/bzr-fastimport/fast-import-filter-fixes into lp://staging/bzr-fastimport

Proposed by Alex Usov
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 339
Merged at revision: 338
Proposed branch: lp://staging/~a-s-usov/bzr-fastimport/fast-import-filter-fixes
Merge into: lp://staging/bzr-fastimport
Diff against target: 40 lines (+14/-1)
1 file modified
cmds.py (+14/-1)
To merge this branch: bzr merge lp://staging/~a-s-usov/bzr-fastimport/fast-import-filter-fixes
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) Approve
Review via email: mp+80035@code.staging.launchpad.net

This proposal supersedes a proposal from 2011-10-20.

Description of the change

Flag renamed

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote : Posted in a previous version of this proposal

As in the python-fastimport merge proposal, I think saying that the option "preserves all history" is misleading. History is still changed, just not as aggressively as it is without the option.

Perhaps --dont-squash-empty-commits would be a better name.

> + help="Preserve all commits and links between them"
This lacks a dot at the end of the line.

Revision history for this message
Jelmer Vernooij (jelmer) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Thanks, this looks good now. I'll merge with a few tweaks to the description.

review: Approve

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