svn:ignore and svn merge - quick questions

[Z W]

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

Re: svn:ignore and svn merge - quick questions

[Thorsten Schöning]

Guten Tag Z W,
am Samstag, 27. April 2013 um 18:51 schrieben Sie:

> 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 ? 

svn:ignore only works on the current versioned directory and only for
objects not under version control in the current working copy.

In your case, you may simply delete the build-folder contents, if you
don't need them in your repo. If you need them, shouldn't they be
merged at all?

http://svnbook.red-bean.com/en/1.1/ch07s02.html
http://svnbook.red-bean.com/en/1.7/svn.advanced.props.special.ignore.html

Mit freundlichen Grüßen,

Thorsten Schöning

-- 
Thorsten Schöning   E-Mail:thorsten.schoen...@am-soft.de
AM-SoFT IT-Systeme  http://www.AM-SoFT.de/

Telefon...05151-  9468- 55
Fax...05151-  9468- 88
Mobil..0178-8 9468- 04

AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow

Re: svn:ignore and svn merge - quick questions

[Johan Corveleyn]

On Sat, Apr 27, 2013 at 6:51 PM, Z W  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

Re: meta-suggestion Re: svn:ignore and svn merge - quick questions

[Daniel Shahaf]

Johan Corveleyn wrote on Sat, Apr 27, 2013 at 20:18:07 +0200:
> [ 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". ]

Well, I would suggest those list-people to doubt themselves a little less
and answer anyway:

- They probably know that part of Subversion better than the poster

- Posters often get some things wrong (example: "I want to use
  global-ignores to avoid merge conflicts", "Why doesn't 'svn ps -F
  .gitignore svn:ignore' work (slashes in the pattern))

- Worst case, someone else will come along and corrects their answer

questions about subversion secondary development

[Edwin Cheung]

Dear sir or madam:
   When I use the binary packages (
Win32Svn,
svn-win32-1.6.21_dev.zip) to run the example code named
"minimal_client.c"(located in the directory of
"subversion-1.6.21\tools\examples"),  I get an access violation on calling
"svn_cmdline_init("minimal_client", stderr)".
 My build tool is Visual Studio 2008 on Windows 7(or Windows xp).How to
solve this problem? Please help me.

Thanks a lot and look forward to hearing from you soon.
Best Regards,
Cunchao Cheung