Stefan Sperling-7 wrote:
>
>> This would be lovely, and is what we're aiming for using tortoise
>> pre-commit
>> hooks and server hooks, although in a bit of a spit-and-sawdust way at
>> the
>> moment.
>
> I'd like to hear how that turns out.
>
> Will you be allowed to share these hooks under
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
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 to a branch
> for which cherry-picking isn't defined in the strategy, svn wou
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
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/mergi
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
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 review (if it's ok what I did) BEFORE checking-in?
>
> svn info a | grep ^Copied
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
