Re: Bugreport: merge just copies new files but doesn't add them to the repository

On Wed, Jul 9, 2014 at 8:05 AM, Marco Tenzer <mtenzer_at_dataforum.de> wrote:
>
> Good afternoon,
>
> I have the following scenario:
> - branch A and branch B
> - branch A has a new file added to subversion
> - I call merge on branch B and choose branch A as "URL to merge from"
>
> --> The new file is copied correctly from branch A to branch B, but not
> added/commited to subversion.
> That means, i get no compile errors, my colleague does.
>

Forgive me if this seems a stupid question. But, I don't see an "svn
commit" step in there. Did you forget to commit your changes after
doing the merge? Merge is a working-copy only operation, you always
need to commit when done.

If the files actually were not scheduled to add in your working copy
(and thus not committed when you did the svn commit), then what
version of TortoiseSVN are you using? This has been working for me
just fine since at least the 1.6.x versions.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084830

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-09 17:34:20 CEST