On Thu, Apr 28, 2011 at 7:44 PM, Ben Carbery wrote:
> I sometimes forget that I perceive time on a different scale to you mortals.
>
> On 28 April 2011 15:43, Nico Kadel-Garcia wrote:
>>
>> On Wed, Apr 27, 2011 at 8:38 PM, Ben Carbery
>> wrote:
>> > Ok running 1.6 now and repository upgraded. Mu
I sometimes forget that I perceive time on a different scale to you mortals.
On 28 April 2011 15:43, Nico Kadel-Garcia wrote:
> On Wed, Apr 27, 2011 at 8:38 PM, Ben Carbery
> wrote:
> > Ok running 1.6 now and repository upgraded. Must have been a recent RH
> > patch?
>
> Not recent: it was publ
On Wed, Apr 27, 2011 at 8:38 PM, Ben Carbery wrote:
> Ok running 1.6 now and repository upgraded. Must have been a recent RH
> patch?
Not recent: it was published with RHEL 5.6.
Ok running 1.6 now and repository upgraded. Must have been a recent RH
patch?
Somebody replied off-list and suggested I just manually recreate the changes
in trunk by comparing two working copies. This seemed slightly less painful
than merging and it worked. After that I just blew away the branch
On Wednesday 27 April 2011, Ben Carbery wrote:
> I have added directories, and moved some files. Also I am using svn1.4
> (still the current Red Hat release) which I understand has a much limited
> version of merge than 1.5+
The first thing to do is to upgrade SVN. Even though this ancient RH rele
On Apr 27, 2011, at 05:34, Ben Carbery wrote:
> I have added directories, and moved some files. Also I am using svn1.4 (still
> the current Red Hat release) which I understand has a much limited version of
> merge than 1.5+
You would be wise to upgrade. Subversion 1.4 and earlier are not suppo
On 4/27/11 5:34 AM, Ben Carbery wrote:
I should have mentioned a couple of things..
I have added directories, and moved some files. Also I am using svn1.4 (still
the current Red Hat release) which I understand has a much limited version of
merge than 1.5+
If you are running RHEL 5, the current
I should have mentioned a couple of things..
I have added directories, and moved some files. Also I am using svn1.4
(still the current Red Hat release) which I understand has a much limited
version of merge than 1.5+
I tried merging but got a lot of errors - if this is the right way to go
about it
On Wednesday 27 April 2011 03:27 PM, Ben Carbery wrote:
Hi,
I am fairly new to version control, and have made what is probably a
newbie mistake.
I created a branch and switched to it. Later I committed changes that
were meant for trunk, forgetting that I had switched to the branch. So
I want to u
Hi,
I am fairly new to version control, and have made what is probably a
newbie mistake.
I created a branch and switched to it. Later I committed changes that
were meant for trunk, forgetting that I had switched to the branch. So
I want to undo this, without losing the changes..
What is the correct
10 matches
Mail list logo
