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

Re: svn commit to trunk picked up by branch. why?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 09 Apr 2011 09:19:08 +0200

On 08.04.2011 20:10, alejandro bustamante wrote:
> Hi all, I use tortoise to handle svn.
>
> I had some changes on my working copy (pointing to trunk) and I
> switched to the branch (with these local changes). I got some
> conflicts, did not commit anything to the branch and switched back to
> the trunk. Fixed the conflicts and kept committing to the trunk. A
> few days later I checked the branch's log and found that the commits
> I made to the trunk also went into the branch. Can anyone explain
> why?
>
> If it helps, the only interesting thing I found on my branch log is
> that some of the files created, that I committed to trunk (which were
> created also on the branch), have as 'Copy from path' in the tortoise
> Log dialog the path to the trunk.
>
> I've searched extensively, and have not found what could have caused
> this. does anyone know? thanks! gtb

Use the check-for-modifications dialog on your working copy. Show the
urls column and check the urls of all files. Maybe the switch didn't
work properly and some of your files are still switched to the branch.
Switched files also have a "(s)" added to their status to indicate that
they're not pointing to the same place.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2718374
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-09 09:19:22 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.