Re: how to find out from where a file has been copied

Stefan Sperling-7 wrote:
>
> There is nothing that tells you this information directly.
> The changes brought in by a merge are treated just like any other
> local changes. As far as Subversion is concerned, you could have made
> any merged changes manually.
>
> Defining a good branching/merging strategy, making sure everyone knows it,
> and consistently keeping to it may help with avoiding such questions
> in the first place.
>
> Stefan
>

OK, thanks.

With respect, your second paragraph is a bit of a cop out. We do have a well
defined branching and merging strategy, the problem is making sure everyone
knows it and follows it, even in the heat of trying to get out a production
fix on a Sunday.

The development mentality in the corporate environment is not the same as in
open source land, where people agonise over their commits for a long time
because they know they're going to be peer-reviewed by many people.

Some of the users here are not really programmers, they're rocket
scientists, and they only write code as a side-effect of their main role.
They expect things to just work, and they're too fantastically intelligent
to learn how to respect the merging rules defined. So they keep telling us
anyway.

I exaggerate but I hope you see my point... we do spell these things out but
we need the big stick too.

-- 
View this message in context: http://old.nabble.com/how-to-find-out-from-where-a-file-has-been-copied-tp30725288p30727591.html
Sent from the Subversion Users mailing list archive at Nabble.com.