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

[Tamás Nepusz]

Hi Sam,

You have to *branch* one of the branches of igraph you wish to propose a merge for; if you want to add your changes to the 0.5 branch, branch our 0.5-main branch first and add your modifications to it. The problem with your approach is that Launchpad has no way of identifying that the files in your repo correspond exactly to our files in our own repo; branching one of our branches makes this connection between them and then Launchpad will know what to do.

-- 
T.

On Thursday, 26 May 2011 at 21:26, Samuel Thiriot 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