On Thu, 2010-01-21 at 23:49 +0000, Gerard Krol wrote:
>
>
> I think this is not the right solution though, it's the update logic
> that needs to be fixed. The lightweight checkout case is especially
> tricky, as you can't require a local commit first because you don't
> have
> those for a lightweight.
But you only ever do one merge if the branch isn't bound, so it doesn't
need to block it either.
On Thu, 2010-01-21 at 23:49 +0000, Gerard Krol wrote:
>
>
> I think this is not the right solution though, it's the update logic
> that needs to be fixed. The lightweight checkout case is especially
> tricky, as you can't require a local commit first because you don't
> have
> those for a lightweight.
But you only ever do one merge if the branch isn't bound, so it doesn't
need to block it either.
-Rob