Re: [Lxde-list] pcmanfm-qt git merge

[Martin B. / b. <br...@bs...>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 2013-11-28 09:39, PCMan wrote:
> The sync seems to be unidirectional and changes in github clones
> don't get into the sf.net <http://sf.net> repos. Your fixes needs
> to be pushed into the sf.net <http://sf.net> repos instead of the
> github clones for the old lxde components.

It is unidirectional. I can choose what is the "real" upstream ofc.
And I can push both ways but in a state of conflict we have to choose
anyhow.

For people working with github merge requests I would suggest to do
the merges done and ready at github and as fast as possible also push
the change to SF.net. That way the commmits will be in both repos more
or less at the same time and my syncer (at the Pootle server) will not
notice any changes other than the fact that they are missing in the
local clone.

This is how it is setup. No fancyness.

SF.net -> Pootle server -> Github

When adding the Pootle web service software stuff it looks like this:

SF.net -> local git
[pootle magic]
SF.net <- local git -> github

First thing is that I pull from SF.net. Later I then compare my index
to the one at github, it will only push the things missing.
If you push your changes to both they will seem to not be missing in
the github end and all is well.

> So, the only way to solve this issue is moving from old git hosting
> to our own git.lxde.org <http://git.lxde.org> as soon as possible.

Will not solve it, will produce pretty much the same situation.
Maybe we can work with that situation in a nicer situation. Having
github and git.lxde.org speak to each other and the pootle server
would be a path worth investigating.
We'll see when the host is fully functional.

- -- 
brother
http://sis.bthstudent.se
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
Comment: Using GnuPG with Icedove - http://www.enigmail.net/

iQEcBAEBCAAGBQJSnK2LAAoJEJbdSEaj0jV719UH/1R6JgAuvBSM26q3B3IMEj1C
sYegAfzyr7sKXDdFnDcabY33bS5cN4Jp6w68swxWjRkIvET5eAnAw50blidB9Uqp
QkrLlH3HGWGc4q+ekSXbXmovh2aJdzgw2GK2Dxx3kM5ZI2AbyNDhO1rBdxMK5VIA
pgSP5mFv47lO5ZlpJzRhEMUkp+eVR8a8yOjzcjn4UKrXzI5F17/gZIzCI3HKGN6u
faZeXTKxoXslYxjH2nyb1Imf9zDxXFhKFnYg4gOBH18KnawsUK1JEoBVxUcrNsfj
FiF49GHccgMmYkwO4US2GOOEaEnoob1o6rnCVSl3uW13Eb7AN3MNGZduRtLjxA8=
=E2Xq
-----END PGP SIGNATURE-----