Re: [igraph] unable to propose a merge in launchpad (lists thousands of changes !)

[Gábor Csárdi]

The problem is that you have created the branch from scratch, so of
course everything is new. (Even if you added the very same files that
main igraph branch has.)

The way to do it is to create the branch from the current state of the
main igraph branch:

bzr branch lp:igraph

And then add your modifications.

Gabor

On Thu, May 26, 2011 at 3:26 PM, Samuel Thiriot
<address@hidden> wrote:
> Hi folks,
>
> I've a newbie problem with launchpad (and bzr ?) I've read the docs and
> tried many solutions, without success.
>
> Using bzr, I loaded the last version of the main igraph branch, then made
> several changes in less than 10 files. Then I uploaded these modifs in the
> "add_game_islands" branch using brz. Files listed in launchpad are coherent.
>
> However, when I propose a merge, it seems like launchpad considers that all
> the files are new - it lists about thousands diffs. I probably screwed up
> somewhere in the directories / subdirectories or so on, but I'm unable to
> solve the problem.
>
> Could you please have a look to this branch and explain what the problem is
> ?
>
> Sorry ...
>
> Thanks :-)
>
> Sam.
>
> _______________________________________________
> igraph-help mailing list
> address@hidden
> https://lists.nongnu.org/mailman/listinfo/igraph-help
>



-- 
Gabor Csardi <address@hidden>     MTA KFKI RMKI