← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tools/weavebench.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-29 00:22:51 UTC
  • mfrom: (3040.2.3 164443-hpss-branch)
  • Revision ID: pqm@pqm.ubuntu.com-20071129002251-zx5sh1lk79tfebhf
Give a better message when failing to pull because the source needs to be reconciled (#164443)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/weavebench.py
14
14
#
15
15
# You should have received a copy of the GNU General Public License
16
16
# along with this program; if not, write to the Free Software
17
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
18
 
19
19
 
20
20
"""Weave algorithms benchmark"""