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

Re: misunderstanding merge

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-04-29 05:25:39 CEST

Ian Schneider wrote:

> svn cat -r 38 baz.txt
> hi there, friend
> line 1
> line 2
> svn cat -r 39 baz.txt
> hi there, friend
> line 1

> svn merge -r 38:39 baz.txt
> <nothing, as in, no response>

> What am I missing?

More context, please. What's the working version of baz.txt in your
working copy?

Is it r39? If so, you're asking the r38:r39 difference to be applied to
it, and that's bound to fail (though I'm surprised there's no error
message?!) "line 2" can't be removed from the working file, because
it's not there. It would be a 'failed hunk' if you were running 'patch'.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 29 05:27:15 2004

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.