<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META content="text/html; charset=utf-8" http-equiv=Content-Type>
<STYLE>
BLOCKQUOTE {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px; MARGIN-LEFT: 2em
}
OL {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px
}
UL {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px
}
P {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px
}
BODY {
LINE-HEIGHT: 1.5; FONT-FAMILY: 微软雅黑; COLOR: #000000; FONT-SIZE: 10.5pt; 36719: ; 38597: ; 40657:
}
</STYLE>
<META name=GENERATOR content="MSHTML 8.00.7601.17514"></HEAD>
<BODY style="MARGIN: 10px">
<DIV>Ok, I got it. Thanks for Daniel and Eric's help.</DIV>
<DIV> </DIV>
<DIV>On 2013-09-17 23:22 , <A href="mailto:berrange@redhat.com">Daniel
P. Berrange</A> wrote:</DIV>
<DIV>
<TABLE width="100%">
<TBODY>
<TR>
<TD width="100%">
<BLOCKQUOTE
style="BORDER-LEFT: #000000 2px solid; PADDING-LEFT: 5px; PADDING-RIGHT: 0px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 0px">
<DIV>On Tue, Sep 17, 2013 at 11:15:55PM +0800,
hzguanqiang@corp.netease.com wrote:</DIV>
<DIV>> Well, Eric, I've created a workbranch, maybe I need to
do the rebase operation.</DIV>
<DIV>> I thought that's just ok to follow the steps where
http://libvirt.org/hacking.html says:</DIV>
<DIV>> git checkout master</DIV>
<DIV>> git pull</DIV>
<DIV>> git checkout -t origin -b workbranch</DIV>
<DIV>> ...modify on workbranch...</DIV>
<DIV>> git pull --rebase</DIV>
<DIV>> ./autogen.sh</DIV>
<DIV>> ./configure --enable-werror</DIV>
<DIV>> make check</DIV>
<DIV>> make syntax-check</DIV>
<DIV>> make -C tests valgrind</DIV>
<DIV>> git pull --rebase</DIV>
<DIV>> git send-email ...</DIV>
<DIV> </DIV>
<DIV>I think your 'git pull --rebase' bit is wrong. There is also
no</DIV>
<DIV>need for 'configure --enable-werror' - autogen.sh runs
'configure'</DIV>
<DIV>for you, and --enable-werror is turned on by default if
building</DIV>
<DIV>from GIT.</DIV>
<DIV> </DIV>
<DIV>Here is what I normally use</DIV>
<DIV> </DIV>
<DIV>To start a new piece of work</DIV>
<DIV> </DIV>
<DIV> git checkout master</DIV>
<DIV> git pull</DIV>
<DIV> git checkout -b workbranch</DIV>
<DIV> ...modify on workbranch...</DIV>
<DIV> </DIV>
<DIV>Once the work is ready, rebase to latest git</DIV>
<DIV> </DIV>
<DIV> git checkout master</DIV>
<DIV> git pull</DIV>
<DIV> git checkout workbranch</DIV>
<DIV> git rebase master</DIV>
<DIV> </DIV>
<DIV>Test the rebase</DIV>
<DIV> </DIV>
<DIV> ./autogen.sh --system</DIV>
<DIV> make check</DIV>
<DIV> make syntax-check</DIV>
<DIV> make -C tests valgrind</DIV>
<DIV> </DIV>
<DIV>Send patches</DIV>
<DIV> </DIV>
<DIV> git send-email ...other.args...
master...</DIV>
<DIV> </DIV>
<DIV> </DIV>
<DIV>Daniel</DIV>
<DIV>-- </DIV>
<DIV>|: http://berrange.com
-o- http://www.flickr.com/photos/dberrange/ :|</DIV>
<DIV>|:
http://libvirt.org
-o-
http://virt-manager.org :|</DIV>
<DIV>|: http://autobuild.org
-o-
http://search.cpan.org/~danberr/ :|</DIV>
<DIV>|: http://entangle-photo.org
-o- http://live.gnome.org/gtk-vnc
:|</DIV></BLOCKQUOTE></TD></TR></TBODY></TABLE></DIV>
<DIV> </DIV>
<DIV><SPAN>
<DIV style="FONT-FAMILY: verdana; FONT-SIZE: 10pt">
<DIV>------------------ <BR>Best
regards!<BR>GuanQiang</DIV></DIV></SPAN></DIV>
<DIV>23:48:32</DIV></BODY></HTML>