annotate tests/test-merge1.out @ 1072:05dc7aba22eb

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.
author mpm@selenic.com
date Fri, 26 Aug 2005 16:49:23 -0700
parents 5a034646e472
children 67a28636ea64
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset
1 merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset
2 merging b
430
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset
3 This is file b1
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset
4 merging for b
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset
5 merging b
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset
6 merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset
7 merging b