add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.

     1

# repo.py - repository base classes for mercurial

     2

#

     3

# Copyright 2005 Matt Mackall <mpm@selenic.com>

     4

#

     5

# This software may be used and distributed according to the terms

     6

# of the GNU General Public License, incorporated herein by reference.

     7

     8

class RepoError(Exception): pass