On Sat, Apr 27, 2013 at 6:51 PM, Z W <mpc8...@gmail.com> wrote: > Hi All > > We like to ignore a set of jar files under our working copy root directory: > working copy root dir: /scratch/testMerge > working copy jars dir: /scratch/testMerge/build/jars > > We tried to perform merging from a trunk to our working copy branch and it > failed because one of the jar inside /scratch/test/build/jars is causing a > conflict. > > (eg /scratch/testMerge/build/jars/a.jar) > > We like to use svn:ignore to ignore the jar files so that the conflict would > go away in the next merge. > What's the correct syntax to svn:ignore using it at the root directory. > We have /scratch/testIgnorePropSetList.txt containing the line > > /scratch/testMerge/build/jars/*.jar > > We tried > > svn propset svn:ignore -F /scratch/testIgnorePropSetList.txt > /scratch/testMerge > svn propget svn:ignore /scratch/testMerge > /scratch/testMerge/build/jars/*.jar > > But conflict still shows for a.jar when merging from trunk to working copy > branch. > > --- Merging r555 into '/scratch/testMerge': > > C /scratch/build/artifacts/jars/a.jar > > > How do we set it right ? > Can svn:ignore be used with svn merge or is svn:ignore only used for svn > checkout as a typical use case for svn:ignore ? > > Thank you > Sincerely
Hi Z W, [ Small meta-suggestion: please drop the "quick question" suffix from your future posts. It's distracting, and often the answers aren't that quick to come up with :-). And because of this, you scare away some potential helpers, when some of us think "hey, I have to think more than 10 seconds about this 'quick question', so I'm probably not the right guy ... perhaps other list-people will answer this one". ] That said, the answer to your current question is straightforward: what you want to do won't work. svn:ignore doesn't work for items you put in subversion, it's specifically for ignoring "unversioned items" (avoiding to pick them up for addition to subversion). See: http://svnbook.red-bean.com/en/1.7/svn.advanced.props.special.ignore.html -- Johan
