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

Re: [PROPOSAL] Merging Improved

From: Tom Lord <lord_at_emf.net>
Date: 2003-04-13 03:28:10 CEST

> From: =?UTF-8?B?QnJhbmtvIMSMaWJlag==?= <brane@xbc.nu>

> Ah, I think I see the difficulty. The merge source *would* be
> recorded in the second case, because accepting or rejecting
> changes isn't part of the automated merge algorithm, it's part
> of merge auditing/conflict resolution, something which cannot be
> automated.

So, I'm looking at some file, and I want to know "Has B:x-y" been
merged into this file?"

And, the properties on this file won't tell me?

To really get the answer, I need some command that crawls over
revisions x-y, finds out if the file changed in B, _then_ looks at the
properties of my copy?



To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Apr 13 03:18:17 2003

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.