[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: Branko Čibej <brane_at_xbc.nu>
Date: 2003-04-11 08:46:38 CEST

Jack Repenning wrote:

>This all depends on having svn:merged props to record the merge history.
>But is there always somewhere to park that property when you need it?
>Something here I'm not quite following, probably because I haven't fully
>grokked a more basic question ... So I'll ask that one:
>If you merge a URL into your WC, some files will change and others will
>not. Can you attach a new svn:merged to all the files in the WC, even
>the unchanged ones, without losing any existing svn:merged?

If the file didn't change, you don't have to record any merge history.
You can, of course, and it doesn't hurt, but it's not necessary to the
proposed algorithm.

Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 11 08:47:28 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.