[TSVN] Re: Bug applying patches?

SteveKing <steveking <at> gmx.ch> writes:

> > TMerge says 'Could not retrieve revision 374 of the file
> > 'c:\inetpub\wwwroot\wa\trunk\sourcecode\wwwroot\wa\support.cs'
> >
> > There seems to be a confusion between working copy path and repos path.
> > 'c:\inetpub\wwwroot\wa' is the working copy,
> > and '\trunk\sourcecode\wwwroot\wa'

> - How was the patch created?
> - Can you provide the patchfile? I need to look at the "Index:" and the
> three lines below that.

I didn't make the patch, so I'll chase it up tomorrow. The top three lines are:

Index: tags/v2.7/sourcecode/wwwroot/webActions/AttribPicker.ascx.cs
===================================================================
--- tags/v2.7/sourcecode/wwwroot/webActions/AttribPicker.ascx.cs
(revision 374)
+++ tags/v2.7/sourcecode/wwwroot/webActions/AttribPicker.ascx.cc
(working copy)

Yeah I know, he's patching a tag (looks dazed). If he's checked out the whole
tag folder, made a change, and then created a patch from /tags (in his WC), will
that cause the behaviour I'm seeing?

Or, more generally, if I checkout '/a' and make a change in '/a/b/c' then create
a patch from '/a', someone else can only apply that to '/a' even though only a
small subtree is modified?

Makes sense when you say it like that!

John

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jun 6 19:49:06 2005