Re: [opensc-devel] gerrit and "Project policy requires all submissions to be a fast-forward."

2012-03-14 Thread Ludovic Rousseau
Le 14 mars 2012 18:56, Peter Stuge a écrit : > Ludovic Rousseau wrote: >> So I used the OpenSC documentation at [2] and rebased my staging >> branch (from [3]) onto gerrit/staging. > > Note that gerrit/staging is a so-called remote tracking branch, and > it's best not to commit to those to avoid c

Re: [opensc-devel] gerrit and merge process: "Submitted, Merge Pending" state

2012-03-14 Thread Peter Stuge
Ludovic Rousseau wrote: > Change 2 now merged. Ok! > I also tried with change 3 > https://www.opensc-project.org/codereview/#change,3 but I get the > error: > "Gerrit Code Review 8:45 PM > > Change cannot be merged due to unsatisfiable dependencies. > > The following dependency error

Re: [opensc-devel] gerrit and "Project policy requires all submissions to be a fast-forward."

2012-03-14 Thread Peter Stuge
Ludovic Rousseau wrote: > So I used the OpenSC documentation at [2] and rebased my staging > branch (from [3]) onto gerrit/staging. Note that gerrit/staging is a so-called remote tracking branch, and it's best not to commit to those to avoid conflicts if other changes arrive from the remote than t

[opensc-devel] gerrit and "Project policy requires all submissions to be a fast-forward."

2012-03-14 Thread Ludovic Rousseau
Hello git experts :-) I try to update change 6 [1] so that gerrit is happy. For now the error is: "Gerrit Code Review 4:21 PM Project policy requires all submissions to be a fast-forward. Please rebase the change locally and upload again for review." So I used the OpenSC documentat

Re: [opensc-devel] gerrit and merge process: "Submitted, Merge Pending" state

2012-03-14 Thread Ludovic Rousseau
Le 14 mars 2012 09:59, Viktor Tarasov a écrit : > Commit 51630a844e8e95e7108cb1966c5f3e21b93a463b is the last common commit > for OpenSC/OpenSC.git(staging) and gerrit's repo. > (By the way, this commit where not submitted to OpenSC.git by gerrit -- > there is no Change-Id in comments) > > Two las

Re: [opensc-devel] gerrit and merge process: "Submitted, Merge Pending" state

2012-03-14 Thread Jean-Michel Pouré - GOOZE
Le mercredi 14 mars 2012 à 10:36 -0500, Douglas E. Engert a écrit : > Rather the stating from zero, or taking a very large branch with many > little patches, > would it be better to have the authors of these patches combine them > into one or > a hand full of larger patches? For example my ECDH wa

Re: [opensc-devel] gerrit and merge process: "Submitted, Merge Pending" state

2012-03-14 Thread Douglas E. Engert
Good to see Ludovic and Peter making progress, Thanks!" Rather the stating from zero, or taking a very large branch with many little patches, would it be better to have the authors of these patches combine them into one or a hand full of larger patches? For example my ECDH was 4 separate patches

Re: [opensc-devel] gerrit and merge process: "Submitted, Merge Pending" state

2012-03-14 Thread Viktor Tarasov
On Tue, Mar 13, 2012 at 6:59 PM, Peter Stuge wrote: > Peter Stuge wrote: > > I made an attempt to kick change 1 loose. > > Ok, so that worked. It would work fine to repeat this for each > change, even if it is a bit labour intensive at least now, to clear > the backlog. I've done it also for chan