Files
git-upstream/git_upstream/tests/commands
Darragh Bailey e231483adc Handle all local changes landed upstream
Allow importing an upstream that contains all local changes by simply
merging to replace the existing target with the upstream branch given.

In certain workflows it is possible for the local changes to have all
landed upstream. In such a case, applying of the changes carried should
detect there is nothing to apply and create import branch to point to
the upstream branch to allow the standard finish actions to complete.

Change-Id: I61ae706f2b240a0e2590e03d2e83db97dafdf962
Closes-Bug: #1367985
2016-08-31 12:09:52 +01:00
..