exporting patches like bitkeeper (was: Introductory mail)

2008-11-22 Thread martin f krafft
also sprach Sam Liddicott <[EMAIL PROTECTED]> [2008.11.19.1533 +0100]: > A set of patches between the source tar and the target released is > automatically generated, coping with merging and branching by > selecting the paths that have the most number of commits - as was > done for the bitkeeper ex

Re: Debian packaging with git and conflicts resolution

2008-11-22 Thread martin f krafft
also sprach Russ Allbery <[EMAIL PROTECTED]> [2008.11.19.0122 +0100]: > You load the new upstream into the upstream branch. Now, you merge the > new upstream into the A, B, and C topic branches. In each case, upstream > used a slightly different bug fix than you had in their new release > (differ

vcs-pkg.org infrastructure (was: Introductory mail)

2008-11-22 Thread martin f krafft
also sprach Sam Liddicott <[EMAIL PROTECTED]> [2008.11.19.1533 +0100]: > err how shall I post it for comment? As I said in the other mail, ikiwiki does not really do attachments yet, I think. If someone wanted to work out how to do that, let me know your alioth.debian.org username and I can ad

attachments for the wiki (was: Introductory mail)

2008-11-22 Thread martin f krafft
also sprach Sam Liddicott <[EMAIL PROTECTED]> [2008.11.19.1648 +0100]: > No, just a few scripts. Hm, I am not sure you can, yet. For now, I could add them to the Git repo (unless you wanted to do that) as plain-text. -- .''`. martin f. krafft <[EMAIL PROTECTED]> : :' : proud Debian develope

Re: vcs-pkg.org infrastructure (was: Introductory mail)

2008-11-22 Thread Adeodato Simó
* martin f krafft [Sat, 22 Nov 2008 14:57:37 +0100]: > As I said in the other mail, ikiwiki does not really do attachments > yet, I think. ikiwiki (2.52) unstable; urgency=low * attachment: New plugin for uploading and managing attachments. This includes a fairly powerful PageSpec based ad

Re: Debian packaging with git and conflicts resolution

2008-11-22 Thread Russ Allbery
martin f krafft <[EMAIL PROTECTED]> writes: > also sprach Russ Allbery <[EMAIL PROTECTED]> [2008.11.19.0122 +0100]: >> You load the new upstream into the upstream branch. Now, you merge the >> new upstream into the A, B, and C topic branches. In each case, >> upstream used a slightly different b

Re: Debian packaging with git and conflicts resolution

2008-11-22 Thread Sam Vilain
On Thu, 2008-11-20 at 12:56 -0600, Manoj Srivastava wrote: > > Manoj, could you detail a particular scenario where you had conflicts > > between the topic branches ? > Sure. Back when I was still the sole maintainer of refpolicy, I > had a branch where we had a Debian specific user role

Re: Debian packaging with git and conflicts resolution

2008-11-22 Thread Manoj Srivastava
On Thu, Nov 20 2008, Sam Vilain wrote: > On Thu, 2008-11-20 at 12:56 -0600, Manoj Srivastava wrote: >> > Manoj, could you detail a particular scenario where you had conflicts >> > between the topic branches ? >> Sure. Back when I was still the sole maintainer of refpolicy, I >> had a br