Hi! On 26 May 2012 20:16, Peter Stuge <pe...@stuge.se> wrote: > Hi, > > Akos Vandra wrote: >> I tried doing: >> >> git fetch ssh://axo...@openocd.zylin.com:29418/openocd >> refs/changes/34/534/4 && git checkout FETCH_HEAD >> git pull ssh://axo...@openocd.zylin.com:29418/openocd refs/changes/69/669/1 >> >> (make changes) >> >> git add ... >> git commit >> tools/checkpatch.sh >> >> However I can't push to the gerrit: > > The above is no good. Please explain in more detail what you want to > do exactly?
I committed a few patches to gerrit over the current origin/master, not having Andreas' patches merged. >From now on I'd like to have Andreas' patches around when I work, because it's easier to see how it works. However whatever I commit also depends on my previous work, so my work kindof depends on two set of patches. Which basically is a merge, which gerrit does not allow me to do. > > Does your new work strictly require both the ftdi driver and the 669 > change, or is the ftdi driver just a nice-to-have while testing? It's just a nice-to-have while testing. > > I'm happy to explain the right workflow when I understand exactly > what you want to do. Thanks! I hope I was clear enough. Regards, Ákos Vandra > > > //Peter > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > OpenOCD-devel mailing list > OpenOCD-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openocd-devel ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ OpenOCD-devel mailing list OpenOCD-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openocd-devel
