Changes have been pushed for the repository "fawkes.git". (Fawkes Robotics Software Framework)
Clone: g...@git.fawkesrobotics.org:fawkes.git Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, common/current has been updated discards 633d043c83d4d94537e175c0c7391f9d97f1e49a (commit) discards 9ae7ed5caff898da2f4a1fbf3d28e6892d13dba9 (commit) to a50d85f1c3ba7403ba3616e8c473c13ecab84f4d (commit) via cb63e11a76d931bd1d47e0e8614ccf2b6a32173b (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (633d043c83d4d94537e175c0c7391f9d97f1e49a) \ N -- N -- N (a50d85f1c3ba7403ba3616e8c473c13ecab84f4d) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. http://git.fawkesrobotics.org/fawkes.git/common/current Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --------------------------------------------------------------- commit a50d85f1c3ba7403ba3616e8c473c13ecab84f4d Merge: c0be9e7 cb63e11 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue Jun 19 13:08:11 2018 -0400 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue Jun 19 13:08:11 2018 -0400 Merge remote-tracking branch 'origin/thofmann/robot-memory-renewal-succeeded-but-lock-expired' into current http://git.fawkesrobotics.org/fawkes.git/commit/a50d85f http://trac.fawkesrobotics.org/changeset/a50d85f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- .../clips-executive/clips/coordination-mutex.clp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) - *Diffs* ------------------------------------------------------------- - *commit* a50d85f1c3ba7403ba3616e8c473c13ecab84f4d - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue Jun 19 13:08:11 2018 -0400 Subject: Merge remote-tracking branch 'origin/thofmann/robot-memory-renewal-succeeded-but-lock-expired' into current .../clips-executive/clips/coordination-mutex.clp | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) _Diff for modified files_: -- Fawkes Robotics Framework http://www.fawkesrobotics.org _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
