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

svn:ignore and svn merge - quick questions

From: Z W <mpc8250_at_gmail.com>
Date: Sat, 27 Apr 2013 09:51:26 -0700

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


We tried

    svn propset svn:ignore -F /scratch/testIgnorePropSetList.txt
    svn propget svn:ignore /scratch/testMerge

But conflict still shows for a.jar when merging from trunk to working copy

--- 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
Received on 2013-04-27 18:52:01 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.