Thomas Arendsen Hein <thomas@intevation.de> [Wed, 29 Mar 2006 22:35:21 +0200] rev 2021
Fix hg push and hg push -r sometimes creating new heads without --force.
Fixing issue179.
The algorithm checks if there not more new heads on the remote side than heads
which become non-heads due to getting children.
Pushing this repo:
m
/\
3 3a|
|/ /
2 2a
|/
1
to a repo only having 1, 2 and 3 didn't abort requiring --force before.
Added test cases for this and some doc strings for used methods.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 29 Mar 2006 10:31:58 -0800] rev 2020
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 29 Mar 2006 10:27:16 -0800] rev 2019
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.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 29 Mar 2006 10:16:04 -0800] rev 2018
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 28 Mar 2006 09:04:33 -0800] rev 2017
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 28 Mar 2006 09:01:07 -0800] rev 2016
fix backtrace printed when cannot get lock.
change lock error handling code so exceptions have useful info and
exception handling in one place.
add test case for when cannot get lock.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 29 Mar 2006 12:45:33 +0200] rev 2015
Catch HTTPException when reading from remote http repository.
If the server dies very early, an httplib.IncompleteRead exception may be
raised, because httplib can't read a single byte. Catching all HTTPException
subclasses here will prevent ugly backtraces for similar things, too.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 28 Mar 2006 09:26:38 -0800] rev 2014
merge with crew.