| commit | c6294a59252b74d4376ad83da16910dd3ca27479 | [log] [tgz] |
|---|---|---|
| author | James E. Blair <jeblair@hp.com> | Fri Aug 17 10:19:48 2012 -0700 |
| committer | Jenkins <jenkins@review.openstack.org> | Fri Aug 17 21:27:06 2012 +0000 |
| tree | 243d0b7aba94a3021a51953bd1b7b4fdad6621f0 | |
| parent | daabed2d7f91e98a73ca85fcfbe1a37f2847d68e [diff] |
Fix merger handling of branches. Force the creation of a remote tracking branch for every remote branch on repo reset, and checkout the relevant branch before applying each change. Add tests that use multiple branches. Change-Id: I5dbb22bc2eba829ffb9443889ebdf8ba573915c0 Reviewed-on: https://review.openstack.org/11566 Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Approved: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins