'bzr help merge' should describe merging a single file

Bug #81758 reported by John A Meinel
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Low
Unassigned
Breezy
Triaged
Low
Unassigned

Bug Description

Using bzr merge to merge changes to only a specific file with:
    bzr merge /path/to/branch/specific/file
has been supported, but is not mentioned in 'bzr help merge'.

On IRC, bignose was trying to merge changes to specific files, and wasn't sure how to proceed. There are actually several ways to do it, but this would be the most straightforward for him.

I'm guessing we haven't mentioned it, because people might think it did more than just 'cherry pick' the changes for that file (apply the changes but not record that it was merged).

See: http://bazaar-vcs.org/BzrCherrypickMetadata
for a discussion of the different types of partial merges (aka cherry picks).

Tags: doc help merge
Martin Pool (mbp)
Changed in bzr:
importance: Undecided → Low
status: New → Confirmed
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
Jelmer Vernooij (jelmer)
tags: added: doc help merge
removed: check-for-breezy
Changed in brz:
status: New → Triaged
importance: Undecided → Low
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.