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

Re: [BUG] Borked 1.5.x CHANGES merging

From: Eric Gillespie <epg_at_pretzelnet.org>
Date: Sat, 12 Apr 2008 12:28:30 -0700

"Hyrum K. Wright" <hyrum_wright_at_mail.utexas.edu> writes:

> I didn't merge the whole branch, because I only wanted the modifications
> to CHANGES, not to the whole branch. Whether or not that was the right
> decision can be debated, but, hey, it's version control: we can
> always grab the other parts of r30112 later if we need them.

Merging just one file from trunk is a perfectly valid use case;
it's the natural way to maintain such a file. I don't think you
did anything wrong.

Eric Gillespie <*> epg_at_pretzelnet.org
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-12 21:28:50 CEST

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.