Cherrypick without merge needed

[Erik Bågfors]

On Wed, Jul 2, 2008 at 2:10 PM, JetMark <extrapic at extrapic.com> wrote:
>
>
>
>
>
>
> Tom Widmer-4 wrote:
>>
>> However, an
>> extension that could query what changesets can be cherry-picked without
>> requiring anything but per-file fast forwards, and that could query what
>> other changesets you need in order to cherry pick one of your choice
>> without any per-file auto-resolutions, combined with the ability to have
>> a per-file fast forward style merge (producing conflicts otherwise),
>>
>
> Tom, you have very clearly exactly understood what I am looking for here,
> and I love the term fast-forward merge because it explains what I was trying
> to explain in oh so many more words!
>
> So far as CVS works, this has worked well for us over an extended period of
> time. I am certain that there must be others doing fast-forward tree merges.
> (As I shall now call it!)
>
> So far as renaming goes this is surely not any different. Think of the fast
> forward philosophy. We just want to replay what the developer has done on
> that tree without including what he has half-done! So if the rename is in an
> approved change set in bazaar include it, otherwise, not.


fast-forward has a different meaning than what you are describing
here, as used in for example GIT.  Please be careful when using that
word as it can cause problems more than help.

Regards,
Erik