[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Issue 838 merge should copy-with-history

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-08-08 22:29:02 CEST

Branko ─îibej <brane@xbc.nu> writes:
> No, not controversial. It's just that I feel very strongly that the
> merge semantics should be fixed ASAP, and that the incidental --
> temporary and "issueized" -- weirdness in the feedback is a low enough
> price to pay for that.
> In the end, it boils down to this: do you think I should revert
> revisions 2910 and 2911? They don't break the tests, and the feedback
> problem shows up _only_ during merge, nowhere else.

Well, the do break the tests *now*, as soon as I commit up my fix to
the test suite, heh. But they only break one or two tests, which I've
simply commented out for now.

If the bad merge semantics were/are going to cause you a real-life
problem, then I happily reverse my earlier position :-). Let's keep
the current changes in the trunk -- and there's no need to do further
development on a branch unless it's going to break things more than
they're broken now (which is to say, more than just the feedback
brokenness). We can just continue on the trunk.

I don't know what's up with the nasty "svn cp" output Philip just
posted, but it's probably related.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 8 22:45:17 2002

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.