Bitbucket Mercurial

Only PB will know for sure...

I tried to use TortoiseHG on my Vista, but ended using hg from the MinGW command prompt, because the GUI of TortoiseHG was quite confusing...
The hg commands are simple enough, at least those few you have to use...

xCometz wrote: I saw your repository on Bitbucket is not a fork from PB, how did you do that?

Forking is a easy way but I want to try hard way because from your and MatCat repository it is possible not as fork, I think.

Starting from hard way could make more experience, I hope.

I could do importing PB repository directly from Bitbucket and then make clone to local work and use it as starting point and make commit and pull to that but how can PB or I merge from/to his/my repository?

Forking is better because bitbucket then knows about the relationship between the repositories.
The way that FDR did it was to do a clone of my repo and then to push it to a different path. if you fork in bitbucket, it is just in reverse...bitbucket makes the clone, and then you pull it.

I don't use eclipse, so I can't really help you with the hg plugin. Also, if you reformat (re-indent) the code with eclipse, I won't be able to pull your changes, so be careful.

I'd recommend using the cmdline version of hg with mingw since we'll be able to give you more support, and I've already documented how to use it here:
deviationtx.com/forum/7-development/73-gui?start=220#503

This is pretty close to what I use:
deviationtx.com/forum/7-development/73-gui?start=100#186

The style I use is pretty close to 1TBS. I was able to get close in Eclipse, by
* making a new style with K&R as the base
* changing indentation to 'spaces only'
* selecting for braces: function -> next line
* selecting for braces: blocks -> next line on wrap

If you setup that style in Eclipse, it will closely math my code. Please only format the files you've created (in the gui dir) as otherwise the merge will be quite difficult.

So it is fine for new code. But if you reformat existing code you'll introduce a lot of changes that will make it impossible for me to pull your code.
I want to be able to run a 'diff' and only see the changes you made, not unrelated format changes.