On the use of Git

[Peter Van Eynde]

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

Hello all,

While working on clisp I noticed that our current strategy for Git
slightly sucks.

Currently we have upstream that moves forward with upstream and we pull
this into master.

The issue which I found is that often you have conflicts and you would
like to use 'rebase' but that will cause problems for the people who are
pulling the branch from alioth.

Another issue is that often when resolving conflicts it is not clear
where the conflict comes from. "Why do we change file xxx again?".

As I am blocked by the freeze from uploading to unstable I wrote down a
proposal for a new architecture in the wiki:

http://wiki.debian.org/Teams/DebianCommonLisp/GitPackaging

could you guys have a look at that and shoot down my stupidities?

Peter

PS: maybe we also need more 'admin' people for the mailing lists. Is
    someone a volunteer to do this?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJMhy2tAAoJEB4VNT76eIlaUQkP+gIY8SFN925RtzO0IgBGg8cp
zmIYry/XfDM1Qa9EPdfcPg7hZe7Mlv4sAsV04Rm7ptiZFvqYnqV3QSm6YBtpldkz
50AYNMC9o81JSMN1CGAy4BdrsiCkAoWrMNVE2DxcDt2KRSpokjS79ajToh33jFCa
AtQhFFWuHF+gTGNlhHAHmhGVEhLzEezJYqNsPL4/k5tCtseImmK/ls+KpjlrBNwC
u0WYwVVrxoQ1UC6ur2UyUN5USZ2IuzDBf6qOI94/GQGXqiQwfthzjO9HWBSiHscE
4TwrrfJFk4GAOofF0tWAhacdVMclRBpS7Y9gXNcqGpuEFwe9w6B5vXFwJ4RPdFGW
57O/a3w3HZ/YVYQpVD0UDHQTFWlrKmObBSKWbIjOmTSWu6KbhP2HorUARbBRMTb6
XsdSPoDL5e3APT9/77FMDs5xyKg4UCjZGRS2w+ks/p4Js/1Qe4Oh1SuDrgZ3lTpo
8KGa4JYxzfVQx5ovdjYWvICr01HNi1R6UIo2FCTsg4O884SAtlg13BAsTdjkWPAi
wBgf5aOUfJ6Gt3hL8XIsvHKaRWRtZEVSRlLssC7R8uPp+E7uswgrDWalocgd+O/r
8EgsRxBevSKIPikXp+CN6+Hv9QW2BwWooKVwaz8JdYQBYwt3E0dw6PaOlndKPgDw
mjwM0EgtdQhklYocHCg2
=WL4X
-----END PGP SIGNATURE-----