"0 conflicts encountered."

[John A Meinel]

Aaron Bentley wrote:
> John A Meinel wrote:
>>> I like that too, but I would really like merge to report about what it
>>> actually did.
> 
> I'm not a big fan of doing that, because it's often overwhelming.  With
> the rate stuff's been coming into bzr lately, data on successful merges
> fills up your terminal buffer.

Thats true. But I would still like to get something more than a single line.
> 
>>> Certainly we still have the bug that diff3 conflicts are reported in the
>>> old locations rather than the new ones. And now it doesn't even tell you
>>> that it moved anything.
> 
> I'm fairly certain we never said when we moved something, unless you
> mean when we move files/directories out of the way?

Well if you have a conflict in a file that is renamed. You only see that
there was a conflict in the old location. Since you don't know where it
was renamed to, you have to at least run bzr conflicts or something.
It isn't a huge deal, but it does give you a warning about a file which
is no longer there.

> 
>>> Also, if we keep --merge-type=diff3 the default, can we include
>>> --reprocess as the default as well? It is a lot nicer. (Naturally,
>>> supplying --show-base would turn it off).
> 
> That's fine by me.  (you meant merge-type=merge3, right?)

Yes.

> 
>>> And when are we thinking to switch to --merge-type=weave?
> 
> I'm not sure.  I actually prefer three-way diffs, most of the time
> - they give you a BASE file, so you can see what changes OTHER made.
> - sometimes, weave merges are more confusing because each version
> deletes different lines, and you wind up with something that doesn't
> make much sense, where Merge3 gives a conflict and shows both sides.
> 
> What would be really nice, though, is a "patience"-based
> SequenceMatcher.  Did you ever get that working well?  The default
> Python one is just too stupid when dealing with files that have had
> partially-matching regions inserted.

Actually, I did get it working. In something that seemed reasonable.
I'll have to look into what it would take to merge it into my
integration branch.

John
=:->

> 
> Aaron

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051202/c6d607fa/attachment.pgp