commit 68064ed33929042e15749743e251c82e41871005
author Stefan Lay <stefan.lay@sap.com> Wed Feb 16 15:46:26 2011 +0100
committer Matthias Sohn <matthias.sohn@sap.com> Mon Feb 21 00:54:02 2011 +0100
tree 92b5fa53cb0d3a9235c9d0acac9417c4c4891b21
parent bd1c1156a06576f4339af4cb9a5cfddfcc80154e

Fix NullPointer when pulling from a deleted local branch

A checked Exception is thrown instead.

The reason for throwing an Exception is that the state of the
repository is inconsistent in this case: There is a merge
configuration containing a non-existing local branch. Ideally the
deletion of a local branch should also delete the corresponding
merge configuration.

Bug: 337315
Change-Id: I8ed57d5aaed60aaab685fc11a8695e474e60215f
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>