Re: Locks on the Bzr repository

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <address@hidden>
> Cc: address@hidden,
>     address@hidden
> Date: Sun, 22 Aug 2010 20:14:52 +0900
> 
>  > And there's the issue of conflicts when you resync next (unless the
>  > committed fix is textually identical to the one in your WT).
> 
> I haven't noticed this being an issue.  It was a massive pain in CVS,
> but with git at least you revert the transaction causing conflicts and
> either do a reverse cherry-pick or an interactive rebase on your tree.
> Then redo the pull/merge/update.  Usually not a big deal, even if it's
> buried many commits deep in the DAG.

Resolving such conflicts is not a big deal in bzr as well.  It's just
added overhead, that's all.  People who don't have too much time try
to avoid that.