Support for tracking cherrypicks

On Mon, Jul 14, 2008 at 02:02:23PM -0000, Ted Gould wrote:
> It appears that SVK does some funny things, and this messes up the logs
> of files that are imported into bazaar. Specifically this happens on my
> Inkscape import. Here is the log history of "configure.ac" in SVN:

> http://inkscape.svn.sourceforge.net/viewvc/inkscape/inkscape/trunk/configure.ac?view=log
> Look at revision: 17075

> In this revision it appears that SVK has copied the previous revision
> deleting the current one? Not sure why, but bzr-svn looses the history
> in this case.

> Here is my bzr-svn import:

> https://code.launchpad.net/~ted-gould/inkscape/trunk

The location where configure.ac is being copied from is in another
branch, so this is technically a cherrypick. Bazaar doesn't support
tracking cherrypicks yet.

  summary "Support for tracking cherrypicks"

  affects bzr

Cheers,

Jelmer

Is it still the case that Bazaar doesn't support cherrypicks? From the merge help:
  "...
  When merging a branch, by default the tip will be merged. To pick a different
  revision, pass --revision. If you specify two values, the first will be used as
  BASE and the second one as OTHER. Merging individual revisions, or a subset of
  available revisions, like this is commonly referred to as "cherrypicking".
  ..."

Bazaar seems to suggest that it does support that (although it may not have when this was filed).

Perhaps this is now fixed?

On Sat, 23 Aug 2008 10:44:24 -0000
John Szakmeister <email address hidden> wrote:
> Is it still the case that Bazaar doesn't support cherrypicks? From
> the merge help: "...
> When merging a branch, by default the tip will be merged. To pick a
> different revision, pass --revision. If you specify two values, the
> first will be used as BASE and the second one as OTHER. Merging
> individual revisions, or a subset of available revisions, like this
> is commonly referred to as "cherrypicking". ..."
>
> Bazaar seems to suggest that it does support that (although it may not
> have when this was filed).
>
> Perhaps this is now fixed?
bzr supports cherrypicking. It does not support _tracking_
cherrypicks. So this is not fixed, but bzr does support
cherrypicking. :)

--
Daniel Watkins (Odd_Bloke)