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

Re: Forcing a commit

From: Jason Dunham <jdunham_at_sfis.com>
Date: 2005-06-23 18:48:18 CEST

kfogel@collab.net wrote:

>Jason Dunham <jdunham@sfis.com> writes:
>
>
>>I've searched the archives on this, and it seems apparrent that
>>Subversion has no analog for the CVS -f option to force a commit.
>>
>>Our development team would like to force commits for built binaries.
>>We store the binaries in the subversion repository because it's a
>>great way to archive our builds and distribute them to coworkers and
>>testers. Maybe that's outside the scope of Subversion, but it works
>>really well for our team. However, it's irritating to have to update
>>the folders which store the installer images. These folders are not
>>sotred in the trunk, but in a separate tree for builds, parallel to
>>the trunk.
>>
>>
>
>Why are you having to update the folders?
>
>
>
There are two of us developing on the same source code in the trunk. If
my coworker commited the last installer image, and then I make a new
build, then I have to update to get his stale installer build before I
can commit the current one.

>>The developers never care if there is a conflict, and on a slow net
>>connection it is frustrating to have to perform a big worthless update
>>right before a big commit.
>>
>>Even better than a -f option on commit would be a svn:ignoreconflict
>>property.
>>
>>
>
>I think we'd want a --ignore-conflicts option, and/or an
>"svn:resolution" property that says how to resolve a conflict (values
>could be 'working', 'new', 'old', etc). Thoughts?
>
>If I understood why you have to do that update, that'd help a lot,
>though.
>
>
>
I like the property idea. 99% of our files work great with Subversion's
exsisting functionality, including everything in the trunk (the source).
But we have a whole "build" branch with about a dozen installer images,
and I'd like to run a commit on the whole folder and have newer files
overwrite whatever is currently in the repo. So I would set a property
on the whole build folder so that I could force the commit on any newer
file. Of course if my coworker changed one of the other images, my
older copy should remain uncommitted. If that's hard to enforce, it
would be fine to just run the commit on the specific subfolder with a
--ignore-conflicts flag.

Thanks,
Jason

>-Karl
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 23 19:02:12 2005

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