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

Re: 2 questions about subversion usage

From: Aaron Hilton <videogamer_at_shaw.ca>
Date: 2005-03-12 22:52:25 CET

Lets see if I can recapture what you're trying to do:

- You have a machine (or two) creating debug builds of those binaries
on a regular basis.
- Those builds are committed to an auxiliary svn repository.
- You're trying to merge the auxiliary repository against your active
repository only on 'good' builds?

This seems more suited to using TAGS as part of your repository
checkout routine. Only 'tag' good builds, and have your developers
pull from the 'TAGS' hierarchy yet still on the auxiliary svn
repository. I don't know if you can do this, but I would try to
side-step trying to force a merge onto another repository.

That leads me to a little pet peeve here though... Can we not have
"FORCE" a part of svn commit? ? ? Come on guys! It's really useful to
just "man handle" the repository sometimes. I find doing a temporary
move, update, and overwrite to be a really pedagogical way of forcing a
commit. Of which really sucks for "getting the job done."

- Aaron.

On 10-Mar-05, at 2:37 AM, Joachim Wingartz wrote:
> 2.) There are a couple of binary files (*.exe and *.dll program files)
> which
> are committed to a second auxiliary subversion database. These files
> are
> frequently recompiled from several places in order to provide proper
> debugging information. As a result we get conficts against this
> repository.
> Is there any way to disable conflict checking for a repository, for
> binary
> files or ...?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Mar 12 22:55:06 2005

This is an archived mail posted to the Subversion Users mailing list.