~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes from revision 4634.101.18

Rev	Summary	Authors	Date
4634.101.1...	.BASE is also dropped by remerge (expected, just didn't find... .BASE is also dropped by remerge (expected, just didn't find the test).	John Arbash Meinel	15 years ago
4634.101.1...	Remove plan_to_base.py, add NEWS entry about fixing bug #404... Remove plan_to_base.py, add NEWS entry about fixing bug #40412	John Arbash Meinel	15 years ago
4634.101.1...	Bring in bzr.dev 4884 Bring in bzr.dev 4884	John Arbash Meinel	15 years ago
4634.101.1...	Add bug #494197 as the source of the KnownFailure test. Add bug #494197 as the source of the KnownFailure test.	John Arbash Meinel	15 years ago
4634.101.1...	Add a knownFailure case where we could drop a .BASE but fail... Add a knownFailure case where we could drop a .BASE but fail to. It is hard to make that case correct, so we don't try (yet).	John Arbash Meinel	15 years ago
4634.101.1...	Clean up a code comment. Clean up a code comment.	John Arbash Meinel	15 years ago
4634.101.1...	Clean up the test_conflicts file for newer apis. Clean up the test_conflicts file for newer apis.	John Arbash Meinel	15 years ago
4634.101.1...	Actually there was a semi-whitebox test, now updated. Actually there was a semi-whitebox test, now updated.	John Arbash Meinel	15 years ago
4634.101.1...	Add a fairly trivial test case, that shows that we drop .BAS... Add a fairly trivial test case, that shows that we drop .BASE, .THIS, and .OTHER files when a conflict occurs. A bit surprising that I couldn't find a similar test case elsewhere.	John Arbash Meinel	15 years ago
4634.101.9	Reverse the .BASE values for --lca and conflicted lines. Reverse the .BASE values for --lca and conflicted lines. It is a bit of an option whether we include or remove them. But including them in BASE means they will likely be removed in the final target, and we would rather have them and remove them manually, than the opposite.	John Arbash Meinel	15 years ago
4634.101.8	Add the criss-cross flip-flop 'bug' for weave merge. Add the criss-cross flip-flop 'bug' for weave merge. This is the reason lca merge was created. However, also show where lca merge fails when there is a more complex ancestry. Since it thinks that a missing line is a source of flip-flop errors, when really it is just a different ancestry.	John Arbash Meinel	15 years ago
4634.101.7	Start working on the ability to drop a .BASE file for --weav... Start working on the ability to drop a .BASE file for --weave and --lca merge. The main issue at this point is what to do about LCA's 'conflicted' states.	John Arbash Meinel	15 years ago
4634.101.6	killed-both and killed-base is 11 chars long. killed-both and killed-base is 11 chars long.	John Arbash Meinel	15 years ago
4634.101.5	First cut at a file for converting .plan files into .BASE fi... First cut at a file for converting .plan files into .BASE files.	John Arbash Meinel	15 years ago
4634.101.4	(andrew) Fix traceback when doing 'bzr push --use-existing-d... (andrew) Fix traceback when doing 'bzr push --use-existing-dir' into a dir with an invalid .bzr directory. (#423563)	Canonical.com Patch ...	15 years ago
4634.101.3	(igc) fix content filtering after pull, merge, switch (#3858... (igc) fix content filtering after pull, merge, switch (#385879)	Canonical.com Patch ...	15 years ago
4634.101.2	(mbp, trivial) additional doc building fix (mbp, trivial) additional doc building fix	Canonical.com Patch ...	15 years ago
4634.101.1	(mbp) cherrypick Japanese Sphinx additions to 2.0 (mbp) cherrypick Japanese Sphinx additions to 2.0	Canonical.com Patch ...	15 years ago
4634.97.3	(INADA Naoki) Import Japanese translation of documentation. (INADA Naoki) Import Japanese translation of documentation.	Canonical.com Patch ...	15 years ago
4634.97.2	(abentley) Improve handling of binary file sections in patch... (abentley) Improve handling of binary file sections in patches.	Canonical.com Patch ...	15 years ago

Older »