sapling/tests/test-merge1.out

%% no merges expected
%% merge should fail
abort: 'b' already exists in the working dir and differs from remote
%% merge of b expected
merging for b
merging b
%%
Contents of b should be "this is file b1"
This is file b1
%% merge fails
abort: outstanding uncommitted changes
%% merge expected!
merging for b
merging b
%% merge of b should fail
abort: outstanding uncommitted changes
%% merge of b expected
merging for b
merging b
Fix bug with co -C across branches, update tests 2005-09-14 03:38:27 +04:00			`%% no merges expected`
abort when merging two heads and repository has local changes 2005-12-15 07:19:03 +03:00			`%% merge should fail`
			`abort: 'b' already exists in the working dir and differs from remote`
Fix bug with co -C across branches, update tests 2005-09-14 03:38:27 +04:00			`%% merge of b expected`
[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted new file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----END PGP SIGNATURE----- 2005-06-22 06:41:57 +04:00			`merging for b`
			`merging b`
Fix bug with co -C across branches, update tests 2005-09-14 03:38:27 +04:00			`%%`
			`Contents of b should be "this is file b1"`
Fix up test-merge1 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up test-merge1 The third test was wrong and showed up after fixing the typo in compare code manifest hash: 306ab9936457ad90e7c7a226d6407ca586262650 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuPH8ywK+sNU5EO8RAql+AJsH/bxFMTMbUiaEoLNhXS6wNkzLAgCfQxDJ 3j5pZ3MzrtPD0y4wC3vIAA4= =VKEy -----END PGP SIGNATURE----- 2005-06-22 09:07:08 +04:00			`This is file b1`
abort when merging two heads and repository has local changes 2005-12-15 07:19:03 +03:00			`%% merge fails`
Spelling fix: "commited" -> "committed" 2006-03-24 16:53:23 +03:00			`abort: outstanding uncommitted changes`
Fix bug with co -C across branches, update tests 2005-09-14 03:38:27 +04:00			`%% merge expected!`
Fix up test-merge1 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up test-merge1 The third test was wrong and showed up after fixing the typo in compare code manifest hash: 306ab9936457ad90e7c7a226d6407ca586262650 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuPH8ywK+sNU5EO8RAql+AJsH/bxFMTMbUiaEoLNhXS6wNkzLAgCfQxDJ 3j5pZ3MzrtPD0y4wC3vIAA4= =VKEy -----END PGP SIGNATURE----- 2005-06-22 09:07:08 +04:00			`merging for b`
			`merging b`
abort when merging two heads and repository has local changes 2005-12-15 07:19:03 +03:00			`%% merge of b should fail`
Spelling fix: "commited" -> "committed" 2006-03-24 16:53:23 +03:00			`abort: outstanding uncommitted changes`
Fix bug with co -C across branches, update tests 2005-09-14 03:38:27 +04:00			`%% merge of b expected`
[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted new file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----END PGP SIGNATURE----- 2005-06-22 06:41:57 +04:00			`merging for b`
			`merging b`