On 11/7/2012 6:57 PM, Mark Anderson wrote:
> Hi All
> I'm reasonably new to SVN. There are two of us at work that use Tortoise SVN. We have a large BI project with many reports in it that we both maintain. We can both be adding new reports or modifying different reports at the same time. We currently have the Solution and Project files under repo, but it's causing problems. If both of us add a report in same day, and one of us commits, the other then has a conflict. (I don't rally have the knowledge/experience to manage conflicts yet.)
> The other thing is that the solution is always showing as modified.
> What's the best practice for this? IS it better just out leave the sln. and .rptproj file out of manually add new reports to our own copies?
> Any he;p greatly appreciated
The ignore-on-commit changelist is probably what you want.
* Right click in the directory with the project/solution files and go to
tortoisesvn -> check for modifications
* Find the project/solution files (check the box to show unmodified if
necessary) and right click on them, go to move to changelist ->
Now if you make a local change to those files they'll show up in a
special section in the commit dialog with their checkboxes unchecked, so
they won't be committed unless you manually check the box. That way you
can both make whatever changes to those files in your working copies
without stepping on each others toes until you actually need to commit
them and share them with the other users. Those files will still show as
modified in your working copies though.
We started doing this with our project and solution files in visual
studio because some people would have their projects compile to weird
places, or change references to test copies of assemblies from projects
they were experimenting with locally, then commit them without thinking
about it. When everyone else pulled down those changes their references
and project settings would be screwed up.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-11-08 14:10:32 CET