ts.
Thanks again
Gavin.
On 31/10/2011, at 11:49 AM, Daniel Becroft wrote:
> On Mon, Oct 31, 2011 at 10:18 AM, Gavin "Beau" Baumanis
> wrote:
> Hi Everyone,
>
> I hoping that I can get some help with the theory of cherry-picking merges to
> a branch.
>
> I
Hi Everyone,
I hoping that I can get some help with the theory of cherry-picking merges to a
branch.
I have the "default" subversion layout;
/trunk
/branches
/tags
I have a "release branch"; ^/branches/releases/1.5
I have "^/trunk/filename.txt"
I have just created a release branch, made some
;
> And hopefully now allow me to merge ^/trunk -> ^/branches/releases - which
> should allow a more pain-free merge for the next release.
>
> Do I have that right?
> Is there something else I can do that would negate the requirement to
> recreate the release branch?
>
> As always - thanks for your assistance.
>
>
> Gavin 'Beau' Baumanis.
>
Hi again Stefan - and thanks for the help.
On 14/07/2011, at 2:04 AM, Stefan Sperling wrote:
> On Thu, Jul 14, 2011 at 01:43:11AM +1000, Gavin "Beau" Baumanis wrote:
>> Hi Stefan,
>>
>> Here is the information you requested;
>>
>> svn status shared;
&
in,
On 14/07/2011, at 1:32 AM, Stefan Sperling wrote:
> On Thu, Jul 14, 2011 at 01:15:29AM +1000, Gavin "Beau" Baumanis wrote:
>> and so now I get this when I try to do a merge
>> I understand why I have a conflict
>> I have an external that is a duplicat
olve it?
As always - a big thanks for all your help.
Gavin.
On 20/04/2011, at 8:49 PM, Stefan Sperling wrote:
> On Wed, Apr 20, 2011 at 03:43:06PM +1000, Gavin "Beau" Baumanis wrote:
>> Hi Everyone,
>>
>> I am having some issues understanding tree conflicts.
Hi Bert,
Thanks very much.
Worked fabulously!
Gavin "Beau" Baumanis
On 11/05/2011, at 11:38 AM, Bert Huijben wrote:
>
>
>> -Original Message-
>> From: Gavin "Beau" Baumanis [mailto:gavin.bauma...@palcare.com.au]
>> Sent: woensdag 11 mei
and just checkout the
trunk only;
But it will cause some downtime that I'd like to avoid if possible.
As always,
thanks!
Gavin "Beau" Baumanis
Hi There,
I am trying to merge a file from trunk to our production branch.
I am using the following command;
svn merge -r 1:head trunk/qry_report.cfm branches/production/qry_report.cfm
--accept="theirs-full"
Which is a routine I have followed since starting to use SVN.
However, I am now getting
appreciate the assistance.
Beau.
On 20/04/2011, at 8:49 PM, Stefan Sperling wrote:
> On Wed, Apr 20, 2011 at 03:43:06PM +1000, Gavin "Beau" Baumanis wrote:
>> Hi Everyone,
>>
>> I am having some issues understanding tree conflicts.
>>
>> I attemp
Hi Everyone,
I am having some issues understanding tree conflicts.
I attempted the following;
svn merge -r1:head trunk/com/palcare/listsServices/
branches/production/com/palcare/listsServices/ --accept="theirs-full"
and got this;
Skipped 'branches/production/com/palcare/listsServices/ListsServi
ered responses - I do appreciate the time
you've taken to help me out.
Gavin "Beau" Baumanis
On 19/04/2011, at 2:21 AM, Henrik Sundberg wrote:
> On Wed, Apr 13, 2011 at 3:27 AM, Gavin "Beau" Baumanis
> wrote:
>> Create a file with svn log
>> (svn log
nd as you have pointed out - I will supply a patch for the AMC section of
INSTALL - once I get it worked out!
Beau.
On 16/04/2011, at 8:02 PM, Daniel Shahaf wrote:
>
>
> On Sat, 16 Apr 2011 17:05 +1000, "Gavin Beau Baumanis"
> wrote:
>> Hi Konstantin,
>&
Hi Konstantin,
Thanks for all your recent help...
Turns out your suspicion is correct.
It was compiler without serf.
Here is what I had a as a directory hierarchy;
Subversion
|-Trunk
|-serf
|-apr
|-apr-utiletc
And because during configure it said that it found apr and apr-ut
ests via make check on my Mac too.
Off to have a play! - thanks again.
Gavin.
On 14/04/2011, at 3:45 PM, Daniel Shahaf wrote:
> On Thu, 14 Apr 2011 14:49 +1000, "Gavin Beau Baumanis"
> wrote:
>> Hi Everyone,
>> I am trying to build SVN from source code on my Mac
Hi Stefan / Konstantin,
Thanks for the responses.
The data mining tool looks promising, and as you state, allows for some "extra"
goodness too.
Gavin.
On 14/04/2011, at 2:20 AM, Stefan Sperling wrote:
> On Wed, Apr 13, 2011 at 11:27:22AM +1000, Gavin "Beau" Baumani
better ask as opposed die wondering...
Gavin.
On 13/04/2011, at 4:52 PM, Konstantin Kolinko wrote:
> 2011/4/13 Gavin "Beau" Baumanis :
>> I have been doing some work everyone's good friend Mr.Google.
>> Every blog / article I read all said the same thing;
>>
eated - which makes it
a slightly painful workflow - just to resurrect an old file.
Is there not a more convenient way to do this?
As always thanks in advance.
Gavin "Beau" Baumanis
statsvn.org/
>
> Cheers.
>
>
> On Thu, Dec 9, 2010 at 20:46, Gavin Beau Baumanis wrote:
> Hi Everyone,
>
> I have been asked for some statistics about our code base and am hoping that
> someone might have had a task for something similar already, and will be able
Hi Everyone,
I have been asked for some statistics about our code base and am hoping that
someone might have had a task for something similar already, and will be able
to help me out.
Here is the text I was sent - but it is really just a guide - it is more a case
of "something" to show as oppo
ways - thanks.
Gavin "Beau" Baumanis
e.
And a follow-up question now springs to mind too, is there a better way?
Doing a merge from 1:head (even with the new, --accept="theirs-full", option)
can be a time-expensive exercise.
As always - Thanks.
Gavin "Beau" Baumanis
On 18/11/2010, at 12:09 AM, Stefan Sper
switch to be used with svn copy?
Of course - I would expect SVN to internally handle the mergeinfo changes
required for the destination path.
Or am I just just doing it wrong - and there is already a simpler solution?
Gavin "Beau" Baumanis
trunk into the trunk.
It seems like it might like work ...
But I thought would check if there was a "simpler" option prior to heading down
that path.
As Aways - thanks.
Gavin "Beau" Baumanis
E: gav...@thespidernet.com
24 matches
Mail list logo
