ut.
>
> Will you be allowed to share these hooks under an open source licence?
>
Would love to, but I doubt it. Will speak to the relevant people though.
I will find a way to at least tangentially report how it's working, or not.
cheers, jamie
--
View this message in context:
h
On Fri, Jan 21, 2011 at 03:56:32AM -0800, JamieEchlin wrote:
>
>
>
> Stefan Sperling-7 wrote:
> >
> > It would be even nicer if Subversion had a way of guiding users to
> > perform merges in accordance with a pre-defined strategy.
> > So if the user tried to perform e.g. a cherry-picking merge
only takes one user to ride rough-shod over your carefully defined merging
strategy because they need to commit urgently to cause many problems going
forward.
cheers, jamie
--
View this message in context:
http://old.nabble.com/how-to-find-out-from-where-a-file-has-been-copied-tp30725288p3072
On Fri, Jan 21, 2011 at 02:59:37AM -0800, JamieEchlin wrote:
> 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
t
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-tp30
On Fri, Jan 21, 2011 at 02:09:13AM -0800, JamieEchlin wrote:
>
>
> Stefan Sperling-7 wrote:
> >
> >> How do I see if file "a" came from 1 or from 2?
> >> How do I see from which revision of file 3 came file c?
> >>
> >> After the check-in, it's clear: svn log will show it.
> >>
> >> How do I r
re commiting?
Of course, I can diff the svn:mergeinfo, and this works if just one line of
it has changed. But if I merge from C to B to A, mergeinfo on A will have
entries for both C and B... how can I tell which was the source of this
merge?
cheers, jamie
--
View this message in con
On Fri, Jan 21, 2011 at 03:26:49AM +0100, Paul Maier wrote:
> Hi,
>
> a question.
>
> Imagine the following:
>
> svn mv 1 a
> svn mv 2 b
> svn cp -r 456 3 c
>
> then modify the files for a while.
>
> svn st will output something like:
> D 1
> D 2
> A+ a
> A+ b
> A+ c
>
> How do I see if file
Hi,
a question.
Imagine the following:
svn mv 1 a
svn mv 2 b
svn cp -r 456 3 c
then modify the files for a while.
svn st will output something like:
D 1
D 2
A+ a
A+ b
A+ c
How do I see if file "a" came from 1 or from 2?
How do I see from which revision of file 3 came file c?
After the check-
