Adding 2 mantises - Was: Re: Help bts-link be a more effective tool

[Sandro Tosi]

On Mon, Feb 2, 2009 at 23:52, Sandro Tosi <morph at debian.org> wrote:
> Hi Oliver,
>
> On Mon, Feb 2, 2009 at 19:24, Olivier Berger
> <olivier.berger at it-sudparis.eu> wrote:
>> Hi.
>>
>> Sandro, you'll find in
>> http://git.debian.org/?p=users/olberger-guest/bts-link.git;a=shortlog;h=refs/heads/fixes (b1927b07252294b15a19b8d8ab2685ac6c273c5b) the changes corresponding to the 2 mantis instances suggested by Michal.
>
> since you merged your master and moredocs branches, and then you
> branch "fixes" this last branch contains all the docs changes on that
> branch...
>
> Let's try this way: for me it's fine if you have all your changes
> (that are valuable, really!) in different branches (I can merge them
> easily, since I got your repo as another remote of my repo) but you
> have to be sure to track closely the "reference" master branch ,that's
> the one of the bts-link project.
>
> Then branch from that master, so that merge your features back in
> master it's really simple.
>
> Now I got
>
> $ git diff master | diffstat
>  README                    |   57 +++++++++++++
>  bin/btslink-spoolindex.sh |    6 +
>  bts/interfaces.py         |   45 ++++++++++
>  btslink.cfg               |  194 +++++++++++++++++++++++++++++++++++++++++++---
>  btspull                   |   15 ++-
>  remote/base.py            |   40 +++++++++
>  6 files changed, 343 insertions(+), 14 deletions(-)
>
> while the changes I really want to merge in master are only on btslink.cfg.
>
> I hope you'll don't get hungry from all those "bounces" but I can't
> resolve all those conflicts, in particular because they are generated
> from applying changes and then reverting them back ;)

I finally understand how git-cherry-pick works :) I still feel easier
with git merge/rebase etc etc, but even this way it can work.

Cheers,
-- 
Sandro Tosi (aka morph, morpheus, matrixhasu)
My website: http://matrixhasu.altervista.org/
Me at Debian: http://wiki.debian.org/SandroTosi