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

Re: Dovetailing issues 960, 951, 926, etc (URLs in WCs)

From: <kfogel_at_collab.net>
Date: 2003-04-09 07:16:53 CEST

mark benedetto king <mbk@boredom.org> writes:
> Well, that depends. It compiles and works, but I haven't tested it
> extensively. It's pretty simple, though.
>
> Many moons ago, when the patch was first submitted, Phillip Martin (IIRC)
> indicated that he was -1 on the change until there was repos-validation
> logic added. That code has not been added, but is now possible due to the
> availability of repository UUIDs.
>
> I can commit the merge-to-trunk now (after a little more testing) so we
> get the functionality, and promise to follow up with UUID-aware changes,
> or I merge the changes on the trunk since the branch into the branch,
> make the UUID changes on the branch, and then merge the branch into the
> trunk.
>
> Which makes the most sense?

Whichever you feel will be easiest for you, IMHO.

The only catch is, if you think there might be a long period of time
(like, more than a week or two) between merging the current changes
into trunk and then adding the UUID changes, then it might be better
to do all the work on the branch, merging to trunk only when it's
complete.

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 9 07:59:48 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.