On Fri, Jan 14, 2011 at 02:12:56PM +0100, peter.schwei...@gmail.com wrote:
> Hi Folks,
>
> i want to merge a branch into trunk. For that i got the first revision
> of the branch with (svn log --stop-on-copy => 2854). Now i want to
> merge with "svn merge -r 2854:3143 ^/branches/mybranch ." in a tr
Thx very much, that solved my problem :-)
Strangely, until now i was able to merge branches into trunk without
this option
Regards,
Peter
On Fri, Jan 14, 2011 at 2:42 PM, Stefan Sperling wrote:
> On Fri, Jan 14, 2011 at 02:12:56PM +0100, peter.schwei...@gmail.com wrote:
>> Hi Folks,
>>
>> i
On Fri, Jan 14, 2011 at 02:53:11PM +0100, peter.schwei...@gmail.com wrote:
> Thx very much, that solved my problem :-)
>
> Strangely, until now i was able to merge branches into trunk without
> this option
>
You got lucky. The --reintegrate option is quite important.
See
http://mail-archive
On Wed, Sep 12, 2012 at 01:39:41PM -0400, John Maher wrote:
> Here's what I did:
Hi John,
your questions are about fundamental Subversion concepts, and
that's fine. Just please understand that I don't want to type
another explanation since good documentation has already been
written. So, below, I
Guten Tag John Maher,
am Mittwoch, 12. September 2012 um 19:39 schrieben Sie:
> I started using subversion a while back and doing a merge I lost a bunch
> of source code which prohibited me from updating production for weeks.
Unless you didn't commit, you can't loose source code, that's what
vers
On 12/09/12 18:39, John Maher wrote:
Hello
[CUT]
Can you please stop reusing an already existing thread and instead start
a new one for a new question?
Thanks
John
Thanks
Giulio
Thanks Stefan.
I did read most of the links. I didn't know about the FAQ, thanks.
Your statement was key:
"Note that the "tree" being talked about there is not an individual
branch, but all nodes in the repository, including the /trunk directory
and the /branches/feature directory."
Basically
39 PM
To: users@subversion.apache.org
Subject: Re: Problem with merging
Guten Tag John Maher,
am Mittwoch, 12. September 2012 um 19:39 schrieben Sie:
> I started using subversion a while back and doing a merge I lost a bunch
> of source code which prohibited me from updating production for weeks.
Unl
Guten Tag John Maher,
am Donnerstag, 13. September 2012 um 15:35 schrieben Sie:
> In reality we should've had code control a long time ago. I only
> got here a few years ago. And when I first got here I met extreme
> resistance about incorporating something like subversion. I finally
> got the
Sent: Thursday, September 13, 2012 4:56 AM
To: John Maher
Cc: users@subversion.apache.org
Subject: Re: Problem with merging
On 12/09/12 18:39, John Maher wrote:
> Hello
[CUT]
Can you please stop reusing an already existing thread and instead start
a new one for a new question?
> Thanks
>
On 13/09/12 15:15, John Maher wrote:
Can you tell me what that means? I had a question on merging so I sent
it to the mailing list. Are you saying I'm not supposed to do that? If
not then can you explain the procedure?
You are hijacking someone else's email. Presumably you have clicked on
users@subversion.apache.org
Subject: Re: Problem with merging
On 13/09/12 15:15, John Maher wrote:
> Can you tell me what that means? I had a question on merging so I
sent
> it to the mailing list. Are you saying I'm not supposed to do that?
If
> not then can you explain the procedure?
You ar
On 13/09/12 15:26, John Maher wrote:
Yes that is what I did. Now that I know that causes problems with the
subversion mailing list I won't do it again.
John
Thank you
Giulio
Guten Tag John Maher,
am Donnerstag, 13. September 2012 um 16:26 schrieben Sie:
> Yes that is what I did. Now that I know that causes problems with the
> subversion mailing list I won't do it again.
It causes problems on nearly every mailing list as they each work
similar. The first mail you sen
On Sep 13, 2012, at 08:23, John Maher wrote:
> How hard is it to change the book? I know what it means now, but the
> next person may get confused. I would bet that someone will eventually
> get confused. If it said "repository tree" like the FAQ I would bet it
> helps.
Book feedback should b
che.org
Subject: Re: Problem with merging
On Sep 13, 2012, at 08:23, John Maher wrote:
> How hard is it to change the book? I know what it means now, but the
> next person may get confused. I would bet that someone will
eventually
> get confused. If it said "repository tree
On Thu, Sep 13, 2012 at 09:23:54AM -0400, John Maher wrote:
> How hard is it to change the book?
Check out the book sources, make changes, and either send a
patch (i.e. the output of "svn diff" showing your changes) to
the svnbook development list, or file an issue in the book's
issue tracker and
Thank you Stefan. Very helpful.
John
-Original Message-
From: Stefan Sperling [mailto:s...@elego.de]
Sent: Friday, September 14, 2012 10:24 AM
To: John Maher
Cc: users@subversion.apache.org
Subject: Re: Problem with merging
On Thu, Sep 13, 2012 at 09:23:54AM -0400, John Maher wrote
John Maher wrote on Thu, Sep 13, 2012 at 10:26:39 -0400:
> Yes that is what I did. Now that I know that causes problems with the
> subversion mailing list I won't do it again.
>
For completeness...
http://subversion.apache.org/docs/community-guide/mailing-lists#fresh-post
19 matches
Mail list logo
