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 067ae6fb44f29b2f03f046a2d021ef7082ecd2dd (commit) discards 95a782ccb5b178be938297f6e325109b4dab6918 (commit) to ffb99ed36db9fa704b609fb3587a52e1e83dfbc8 (commit) via 9c939c1d51c478bbdea3079609b90caeec1b83e3 (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 (067ae6fb44f29b2f03f046a2d021ef7082ecd2dd) \ N -- N -- N (ffb99ed36db9fa704b609fb3587a52e1e83dfbc8) 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 ffb99ed36db9fa704b609fb3587a52e1e83dfbc8 Merge: 0fa369c 9c939c1 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Sat Jun 16 12:05:37 2018 -0400 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Sat Jun 16 12:05:37 2018 -0400 Merge remote-tracking branch 'origin/common/cx-wm-robmem-types' into current http://git.fawkesrobotics.org/fawkes.git/commit/ffb99ed http://trac.fawkesrobotics.org/changeset/ffb99ed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- - *Diffs* ------------------------------------------------------------- - *commit* ffb99ed36db9fa704b609fb3587a52e1e83dfbc8 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Sat Jun 16 12:05:37 2018 -0400 Subject: Merge remote-tracking branch 'origin/common/cx-wm-robmem-types' into current .../clips-executive/clips/wm-robmem-sync.clp | 4 ++-- 1 files changed, 2 insertions(+), 2 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
