[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 10:28:33 -0700

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

> Mark Phippard wrote:
> > We went through similar issues a couple weeks ago with Julian. The
> > problem was that his 1.5.x branch was checked out before we updated to
> > 1.5 and "cleaned" the repository. If you recall, all WC's needed to
> > be re-checked out once we did that. CHANGES should not have any

This working copy is only a few days old; I didn't even have
1.5.x checked out on my laptop until then.

> In r30329, I merged r30112 from trunk which touched both CHANGES and the release
> notes. I didn't want to merge the release notes, because we no longer ship
> www/ (with the exception of hacking.html) with the release tarballs. So I
> cherry picked r30112 to CHANGES itself.
> If it annoys us to have CHANGES modified for every commit to 1.5.x, does that
> say something about how our users will feel?

I'm a user, and I'm annoyed. But I can get over it, if I
understood why I couldn't manage to sync it with trunk again.

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 19:28:49 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.