Mercurial > hg > pyhgsh
diff tests/test-merge6.out @ 993:6f274afc05c7
Clean up some merge logic
- rename mode to branch_merge
- use explicit update mode
- use negative mtime for updates that set mtime
- expand some cryptic variable names
- elaborate merge dirstate comments
- remove redundant manifest lookup for non-merge case
- remove impossible merge case
- fix up test cases
| author | mpm@selenic.com |
|---|---|
| date | Tue, 23 Aug 2005 02:19:38 -0700 |
| parents | 5007e0bdeed2 |
| children | 9344f5dd4488 |
line wrap: on
line diff
--- a/tests/test-merge6.out Mon Aug 22 01:22:29 2005 -0700 +++ b/tests/test-merge6.out Tue Aug 23 02:19:38 2005 -0700 @@ -6,7 +6,7 @@ added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) bar should remain deleted. -f405ac83a5611071d6b54dd5eb26943b1fdc4460 644 foo +f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo pulling from ../A2 searching for changes adding changesets