| commit | 0c9e4f3e995cd759236e7647bb8f710add1b68ae | [log] [tgz] |
|---|---|---|
| author | James E. Blair <jeblair@redhat.com> | Wed Nov 30 10:03:27 2016 -0800 |
| committer | James E. Blair <jeblair@redhat.com> | Wed Nov 30 10:03:27 2016 -0800 |
| tree | eee6b5cff16fc576b5b5b5d7f87def217c023963 | |
| parent | c5e4f1d262a594b97020a9646d30cecd436b6e97 [diff] |
Don't merge post-merge items In all cases, the launcher-merger updates the repos involved in a job before running it. If there are pre-merge changes, it then merges those changes into the repos. If the job does not involve pre-merge changes, then nothing further needs to happen. Avoid attempting to merge changes which are already merged in this case. Change-Id: Ie0c0d258b4edad4afc3b569f8ea222523bc769c1