tree de8d42626a63a876fc3cb80518b91a06de7f96a3
parent 0d9521568441e46a47e78037b4906d5305b17364
author James E. Blair <jeblair@redhat.com> 1487091949 -0800
committer James E. Blair <jeblair@redhat.com> 1487092172 -0800

Reset merger repo when performing an update

When a merger "updates", it fetches remote data but does not alter
any of the local branches.  However, the new "getFiles" merger
function expects to be able to fetch data from any given branch.
If a merger is "updated" and then calls "getFiles", it will return
data from whatever commit the local branch points to, not what the
newly-updated remote branch points to.

This change alters the "update" command to "reset" the repo.  A
merger reset is an update as above, followed by a forced re-creation
of all the local branches to mirror the remotes.  This will cause
getFiles (as long as it is preceded by an update) to return the
correct data.

Change-Id: Ic475c4437dcd045d8d07a391159d555a379e97b8