tests/test-merge3.out
author mpm@selenic.com
Fri, 26 Aug 2005 16:49:23 -0700
changeset 1072 05dc7aba22eb
parent 925 5a034646e472
child 1747 91c56c427171
permissions -rw-r--r--
Fixes for push corner case TAH found a bug where push would push things the remote already had, raising an assertion. This turned out to be because the changeset protocol was not recording a common subset node in one case. Also discovered was that the protocol was queueing multiple copies of a node for pull. Fixed by changing fetch to a hash. Add some more debugging output.

removing b
b never committed!
nothing changed