This is the mail archive of the crossgcc@sourceware.org mailing list for the crossgcc project.
See the CrossGCC FAQ for lots more information.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
Titus, All, On Saturday 22 May 2010 00:08:41 Titus von Boxberg wrote: > A thing I still do not understand but would like to incorporate into the HOWTO: > How does one know if and when the patches were accepted upstream? > Is this noticed by hg automagically? Not as far as I know. I do not use that, and I manually track patches that got upstreamed, and those that were left behind. > AFAI understand that staying in sync with upstream while having a nonempty > mq patch queue is done by: > hg qpop -a > hg pull > hg update > hg qpush -a Basically, yes. Except for the upstreamed patch that should be trimmed from the series before qpush-ing again. > What happens to the qpush if the cloned upstream repository already contains > some or all of the patches from > my local queue? Conflicts, I guess? ;-) > Am I notified, are the already integrated patches skipped or removed, > or is desaster ahead? I try to send a confirmation email, such as: http://sourceware.org/ml/crossgcc/2010-04/msg00102.html http://sourceware.org/ml/crossgcc/2010-04/msg00100.html From the Hg perspective, the only message you'd get is a conflict. This section of the Hg manual may help: http://hgbook.red-bean.com/read/managing-change-with-mercurial-queues.html#sec:mq:merge Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' -- For unsubscribe information see http://sourceware.org/lists.html#faq
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |