Two heads PyChess in source code

[GoogleCodeExporter]

Hi,
it looks we have two heads in source code. Conflicts are in file 
lang/pt_BR/LC_MESSAGES/pychess.po
Regards

Original issue reported on code.google.com by igo...@gmail.com on 21 Jan 2011 at 5:51

[GoogleCodeExporter]

I did:

1. Removed repository to make sure I haven't broken something.
rm -rf pychess

2. Cloned repository.
hg clone https://pychess.googlecode.com/hg/ pychess

3. Saw heads.
hg heads | head -n 15

It is clear there are two heads: 31c0f162e529 (tip) and e3ab6f27a9e1

4. Merged revisions.
hg merge -r e3ab6f27a9e1

5. Conflics appeared in lang/pt_BR/LC_MESSAGES/pychess.po I just assumed that 
file from the tip revision has the latest translations for Brasil, so I have 
manually merged the file with kdiff3 tool selecting tip revision changes on 
every conflict.

6. Commit changes.
hg commit

7. Push changes back to Google code
hg push

I hope I have fixed the problem.

Leogregianin, can you please check Brasilian pychess.po file you have uploaded 
if everything is ok.

Original comment by igo...@gmail.com on 21 Jan 2011 at 5:58

[GoogleCodeExporter]

This problem should be solved in revision: 5fe473aa6f

Original comment by igo...@gmail.com on 21 Jan 2011 at 6:04

[GoogleCodeExporter]

Now, everything is ok. Thanks.

Original comment by leogregianin@gmail.com on 22 Jan 2011 at 1:06

• Changed state: Fixed