On Tue, Jun 07, 2011 at 07:08:44PM +0100, Jon Foster wrote:
> Hi,
>
> I'm having trouble resolving a tree conflict.
>
> I'm working on a feature branch, and I regularly merge from trunk to the
> branch. In my latest merge, I got a tree conflict because a directory
> ("playback") has been added b
Hi,
I'm having trouble resolving a tree conflict.
I'm working on a feature branch, and I regularly merge from trunk to the
branch. In my latest merge, I got a tree conflict because a directory
("playback") has been added both to trunk and to my branch, with
different contents. I want to get rid
> -Original Message-
> From: Ulrich Eckhardt [mailto:ulrich.eckha...@dominolaser.com]
> Sent: dinsdag 7 juni 2011 17:06
> To: users@subversion.apache.org
> Subject: Re: How to undo a switch?
>
> On Tuesday 07 June 2011, Bill Herring wrote:
> > I have just selected a file and chose ‘switc
On Tuesday 07 June 2011, Bill Herring wrote:
> I have just selected a file and chose ‘switch to’ a tag recently used to
> tag a release of my complete project. I mistakenly assumed that in doing
> so I would just switch the particular file to the version in the tagged
> release.
The reason that th
Hello,
I selected a file and chose ‘switch to’ a tag recently used to tag a release of
my complete project. I mistakenly assumed that in doing so I would just switch
the particular file to the version in the tagged release. However instead the
result was that my file was converted into a folder
Am Dienstag, den 07.06.2011, 08:13 -0500 schrieb Les Mikesell:
> Yes, I have a hard time visualizing how any tool can help with
> concurrent changes if one side doesn't stop while the merges happen
> both ways and the results get back.
Just look at Clearcase (again, sorry :) ). First, it has exce
On 6/7/11 6:52 AM, Nico Kadel-Garcia wrote:
On Mon, Jun 6, 2011 at 6:16 AM, Stefan Sperling wrote:
On Mon, Jun 06, 2011 at 11:55:42AM +0200, Andreas Tscharner wrote:
People here will hate me for this, but I think you should switch to a
DVCS (Distributed Version Control System), like Mercurial
On Mon, Jun 6, 2011 at 6:16 AM, Stefan Sperling wrote:
> On Mon, Jun 06, 2011 at 11:55:42AM +0200, Andreas Tscharner wrote:
>> People here will hate me for this, but I think you should switch to a
>> DVCS (Distributed Version Control System), like Mercurial or git.
>
> If people hate you for makin
On Mon, Jun 6, 2011 at 4:04 PM, Sam Theman wrote:
> Hello,
>
> I am currently running subverison 1.6.11 with apache 2.2.15
>
> I need to go to subversion 1.6.17. So I was just going to build
> subversion1.6.17 svn modules and put them into the apache2 modules
> directory.
>
> I tried to build subv
