Bazaar

Will cherry picked merges get branch history soon?

Asked by Greg

I am working on multiple applications. These applications share some code projects. For convenience, each application is a separate branch. From time to time, I want to update some of the shared code projects, sometimes just a few files, sometimes a whole folder of code, to share updates or fixes with other applications. (I believe this is what VCS people call 'cherry picking').

I notice that if I merge just a few files or a folder tree, I get no branch history. However, if I merge from the root, I do get full branch history, even if the merge produced identical results. Detailed history (as per the full merge) is very desirable to me. With my current work flow and project layout, I would rarely want to do a full merge, just regular 'cherry picks'.

Is merge going to be improved to provide better history for my kind of usage?

I found a Bazaar page on this very topic somewhere, but I have not been able to relocate it to post a link here. That page suggested such an improvement was at least being considered.

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Martin Pool (mbp) said : 		#1

Yes, we would like to do this, but I don't know of anyone planning to tackle it soon.

Revision history for this message
Joke de Buhr (joke) said : 		#2

You should try the "qbzr" plugin. It's logging component "qlog" shows history entries which the command line client does not.

bzr qlog name_of_cherry_picked_folder_or_file

Revision history for this message
Greg (gregspecialsource) said : 		#3

Joke de Buhr, I am using Bazaar Explorer which I believe uses qbzr for most of its UI including logging.
In this specific case, I see history for the file, but the history is the same as if I manually edited the file(s) and made the changes. There is no history showing reference to other branches where the changes originated.

Revision history for this message
Joke de Buhr (joke) said : 		#4

I never used bazaar explorer for history browsing. I just tried it but I can't seem to get the history for a single file or folder just the history of the whole branch. So this is the history I get using qlog directly:

Using "bzr log --include-merges cherry_picked_folder" I get a output like this one:
    ------------------------------------------------------------
    revno: 1871 [merge]
    committer: Joke de Buhr <email address hidden>
    branch nick: server
    timestamp: Thu 2009-11-12 19:45:26 +0100
    message:
    merged extra-addons

Using "bzr qlog cherry_picked_folder" i get a qbzr window with one expandable merge entry with the entire history of that specific folder.

Revision history for this message
Mustafa Sakalsiz (mutisaki-deactivatedaccount) said : 		#5

More than a year passed. I think there is no progress for the record of cherry picking. I have a developing branch. I release very often. Every commit in the developing branch is a feature. I pick some features and they are merged into the release branches. Without tracking merged revisions, cherry picking is a nightmare. Most of the VCS tools support this feature, even the subversion supports it. It is a shame for bazaar.

Can you help with this problem?

Provide an answer of your own, or ask Greg for more information if necessary.

To post a message you must log in.