svn merge: Confusing error message

[makl <ma...@tigris.org>]

$ svn --version
svn, version 1.0.0
   compiled Feb 25 2004, 18:32:49
[snip]

$ svnadmin create repo

$ svn co file:///g:/repos/repo wc1
Checked out revision 0.

$ mkdir wc1\dir1

$ svn add wc1\dir1
A         wc1\dir1

$ svn ci -m "" wc1
Adding         wc1\dir1

Committed revision 1.

$ svn delete wc1\dir1
D         wc1\dir1

$ svn ci -m "" wc1
Deleting       wc1\dir1

Committed revision 2.

$ svn merge -r 2:1 file:///g:/repos/repo wc1
Skipped 'wc1\dir1'
Skipped missing target: 'wc1\dir1'

# What should this message tell us?
# General error?
# Current directory not up to date?
# ...




---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn merge: Confusing error message

[makl <ma...@tigris.org>]

Ben Collins-Sussman wrote:

> Can you do two things for us?
>
> 1. Repeat the recipe, but 'svn update wc1' after each commit.

Works without Problems.

> 2. File your original recipe as a new issue, so we remember to 
> investigate.

Filed as Issue 1769




---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn merge: Confusing error message

[Ben Collins-Sussman <su...@collab.net>]

makl wrote:
> $ svn --version
> svn, version 1.0.0
>   compiled Feb 25 2004, 18:32:49
> [snip]
> 
> $ svnadmin create repo
> 
> $ svn co file:///g:/repos/repo wc1
> Checked out revision 0.
> 
> $ mkdir wc1\dir1
> 
> $ svn add wc1\dir1
> A         wc1\dir1
> 
> $ svn ci -m "" wc1
> Adding         wc1\dir1
> 
> Committed revision 1.
> 
> $ svn delete wc1\dir1
> D         wc1\dir1
> 
> $ svn ci -m "" wc1
> Deleting       wc1\dir1
> 
> Committed revision 2.
> 
> $ svn merge -r 2:1 file:///g:/repos/repo wc1
> Skipped 'wc1\dir1'
> Skipped missing target: 'wc1\dir1'
> 
> # What should this message tell us?
> # General error?

It's not a general error;  it fact, it's not an error at all.  You asked 
'svn merge' to apply a patch to your working copy, and parts of the 
patch could not apply.  It's just like when you run the 'patch' program 
prints things like "warning:  failed hunk".

However, I wonder if you haven't found a subtle bug here.  I think your 
merge command *should* be re-adding dir1 to the working copy.  I suspect 
that somehow this has to do with the way we deal with mixed revision 
working copies.  After committing your deletion, the wc still has an 
entry for dir1 in a 'deleted' state... and somehow this is preventing 
the merge from re-adding it.

Can you do two things for us?

1. Repeat the recipe, but 'svn update wc1' after each commit.

2. File your original recipe as a new issue, so we remember to investigate.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org