5:23 a.m.
https://bugs.meego.com/show_bug.cgi?id=735
pohly <patrick.ohly(a)intel.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|ASSIGNED |RESOLVED
CC| |patrick.ohly(a)intel.com
Resolution| |FIXED
--- Comment #1 from pohly <patrick.ohly(a)intel.com> 2011-10-27 18:23:13 UTC ---
Resolved with the following commit:
commit 3e9fc042dc47d090e87b5a7dccce5945128fec65
Author: Patrick Ohly <patrick.ohly(a)intel.com>
Date: Thu Oct 27 16:44:44 2011 +0000
testing: automatically integrate branches (BMC #735)
Branches committed to the libsynthesis or SyncEvolution git repo with
a name of "for-<branch>/<name>" will be automatically merged
into
<branch> before starting the testing:
--sourcedir <dir with existing repos> --workdir <dir with merged
repos>
The result can be reused as-is in further runtests.py invocation by using
--sourcedir <merged repos> --no-sourcedir-copy
Any local, *uncommitted* changes will be preserved and applied to
the merged sources (git stash). *Committed* changes will *not* be
applied. Always push them immediately.
Because there is a risk of loosing work when these rules are not
followed, the current state of the tree is stored as a branch created
with "git stash create" under the names
<branch>-nightly-before-<date+time> and <branch>-nightly. The
latter
gets overwritten during each run.
These branches can be used to cherry-pick commits or restore the tree
as it was before the automatic merging ("git stash branch <branchname>
<branch>-nightly").
Result reporting includes information about the resulting code
revision. This includes the names of all branches which were
available for merging and whether that succeeded or failed. The output
of "git describe" is also included, always with a hash (even when it
matches a tag, in case that the tag gets moved) and whether the
working tree was dirty. All commits applied to the base branch are
listed in "git am" format.
This is done because the merged code is not pushed. This would clutter
the upstream code repository.
The "for-" prefix (instead of just "<branch>/") was added
because git
got confused when <branch> was both a real branch and a directory of
other branches.
--------
Product: SyncEvolution
Component: SyncEvolution
MeeGo Release: unspecified
Severity: enhancement
Priority: Medium
Keywords:
Status: RESOLVED
Who: patrick.ohly(a)intel.com
Assigned To: syncevolution-bugs(a)meego.bugs
Target Build: ---
Flags:
Changed: Status CC Resolution
--------
https://bugs.meego.com/show_bug.cgi?id=735
--
Configure bugmail: https://bugs.meego.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.