> On 31.03.2015 17:53, Thomas Kopp wrote:
> > Hi all;
> >
> > Please bear with me, I don't know TortoiseSVN in depth...
> >
> > In our repository we have (among others) a Codebase branch and a Next
> > Release branch. The Codebase branch is the production copy of the
> > code. The Next Release branch is a copy of the Codebase branch with
> > branches for the next version release merged into it. When we are
> > ready to release the next version of our code, I checkout Codebase to
> > my machine, merge Next Release into it, then commit Codebase.
> >
> > On our web server, we have a Working Local Copy directory that we use
> > to build the code. It was set to the Next Release repository branch
> > so we could build and deploy the Next Release to test. Yesterday I
> > merged Next Release into Codebase. A Check for Modifications listed
> > the expected files. I then committed the changes to Codebase.
> >
> > When switching the web server Working Local Copy from Next Release to
> > Codebase, the file content should be the same. However, the switch
> > gives a list of files that were updated, that list being the same
> > files that were changed in the commit to Codebase. Switching back to
> > Next Release again lists those files as updated.
> >
> > However, I checked out fresh copies of both to my local machine and
> > did a WinMerge compare, and the file content for both directories
> > matches.
> >
> > In the log, the Next Release branch is at revision 6752 and the
> > Codebase branch is at revision 6756. But when switching a directory
> > between those branches, the final message is "Completed At revision:
> > 6756", even when switching from Codebase to Next Release.
> >
> > When did the merge and committed the changes to Codebase yesterday, I
> > was running TortoiseSVN (client) 1.8.8, and the server was running
> > 1.7-something. Today we updated both to 1.8.11.
> >
> > I've seen instances of TortoiseSVN picking up a property change and
> > calling a file changed when the content is the same. Is that the
> > kind of thing that's happening here? Why is it "updating" these
> > files when the content is the same? Is it because they're from
> > different revisions? And why am I getting the message "Completed At
> > revision: 6756" when switching from a branch at revision 6756 to a
> > branch at revision 6752?
> >
> > I'm being asked why files are being shown as updated on a Switch when
> > the files match, and right now I don't have an answer... Thanks for
> > any help...
>
> Did you do the switch with TSVN or the command line client?
> My guess is that the files were not updated but their properties
> changed. And since you switched from a branch were you merged stuff to a
> branch were you haven't merged or merged other stuff to, the
> svn:mergeinfo property is different. And that's what's shown during the
> update: not the file *content* changes but the file *properties*.
>
> Stefan
Hi Stefan;
Thanks for replying. I did the switch with the TortoiseSVN context menu (I'm on Windows) -- right-click, TortoiseSVN-->Switch.
Yeh, I was thinking it was a properties thing. This has happened a couple other times, where I do a merge and commit then on the production machine they do a switch between two branches that have the same file content but still get a message that a file was updated. Then they get nervous and start asking me questions... I don't know much about the properties other than that they can change and the file content remain the same. Going to google "svn:merginfo" now... Thanks!
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3110173
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-04-02 18:35:03 CEST