Am 08.12.2011 04:39, schrieb Daniel C:
Please take the time to report this on the Subversion mailing list
with as much information as possible about what you were trying to
do.
Please read this sentence, it is important!
You can find the mailing list archives at
http://subversion.apache.org/
On Wed, Dec 07, 2011 at 04:23:09PM -0700, Randall Reynolds wrote:
> Hi,
>
> I created a trunk and branch A from the trunk. Then, I created a file in
> the trunk. Then, I merged from the trunk to the branch using TortoiseSVN's
> merge two branches option. The merge encountered a tree conflict on
On Thu, Dec 08, 2011 at 07:20:44AM +, Cooke, Mark wrote:
> > Do I have to have my working folder and svn folder have the same name?
> Did you read the [free!] link that I gave you yesterday?
> [1] http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/index.html
>
> [2] http://svnbook.red-bean.com
Case in point: the last two paragraphs you just wrote should be written
up somewhere other than the mailing list archives. :-P
Stefan Sperling wrote on Thu, Dec 08, 2011 at 12:21:42 +0100:
> On Thu, Dec 08, 2011 at 07:20:44AM +, Cooke, Mark wrote:
> > > Do I have to have my working folder and
Hello,
I'm using subversion and python-subversion on a debian squeeze system.
The package version is 1.6.12dfsg-4.
I'm trying to modify the behavior of the changed command of the
svnlook.py file provided by python-subversion.
I'm want to show that a directory was copied by adding a "+" to the
ou
Marc Schlinger wrote on Thu, Dec 08, 2011 at 14:07:06 +0100:
> Hello,
>
> I'm using subversion and python-subversion on a debian squeeze system.
> The package version is 1.6.12dfsg-4.
>
> I'm trying to modify the behavior of the changed command of the
> svnlook.py file provided by python-subversi
Le jeudi 08 décembre 2011 à 15:20 +0200, Daniel Shahaf a écrit :
> Marc Schlinger wrote on Thu, Dec 08, 2011 at 14:07:06 +0100:
> > Hello,
> >
> > I'm using subversion and python-subversion on a debian squeeze system.
> > The package version is 1.6.12dfsg-4.
> >
> > I'm trying to modify the behav
Stefan,
I did not understand the three merge options and clearly chose the wrong
option. After reading your response and reading about the merge options, I
now understand this. Thank you.
I changed my workflow to use the first option and merged the range
<#>-HEAD, where <#> is the last trunk re
> On Thu, Dec 8, 2011 at 4:05 AM, Stefan Sperling wrote:
>
> > > On Wed, Dec 07, 2011 at 04:23:09PM -0700, Randall
> > > Reynolds wrote:
> > > Hi,
> > >
> > > I created a trunk and branch A from the trunk. Then,
> > > I created a file in the trunk. Then, I merged from
> > > the trunk to the b
Thanks, Mark!
On Thu, Dec 8, 2011 at 8:29 AM, Cooke, Mark wrote:
> > On Thu, Dec 8, 2011 at 4:05 AM, Stefan Sperling wrote:
> >
> > > > On Wed, Dec 07, 2011 at 04:23:09PM -0700, Randall
> > > > Reynolds wrote:
> > > > Hi,
> > > >
> > > > I created a trunk and branch A from the trunk. Then,
> >
When I select merge a range of revisions and leave the range blank, it says:
Merging r7 through 42194
<~10 tree conflicts on main folders>
Does this mean we have never merged the trunk into the branch correctly in
a way that merge tracking recognizes, and how should I proceed to fix the
issue?
T
Correction: r7 through r2194
On Thu, Dec 8, 2011 at 10:15 AM, Randall Reynolds <
randallmreyno...@gmail.com> wrote:
> When I select merge a range of revisions and leave the range blank, it
> says:
>
> Merging r7 through 42194
> <~10 tree conflicts on main folders>
>
> Does this mean we have never
Marc Schlinger wrote on Thu, Dec 08, 2011 at 16:00:03 +0100:
> Le jeudi 08 décembre 2011 à 15:20 +0200, Daniel Shahaf a écrit :
> > Marc Schlinger wrote on Thu, Dec 08, 2011 at 14:07:06 +0100:
> > > Hello,
> > >
> > > I'm using subversion and python-subversion on a debian squeeze system.
> > > The
On Thu, Dec 08, 2011 at 10:15:24AM -0700, Randall Reynolds wrote:
> When I select merge a range of revisions and leave the range blank, it says:
>
> Merging r7 through 42194
> <~10 tree conflicts on main folders>
>
> Does this mean we have never merged the trunk into the branch correctly in
> a w
Hi,
I've got the error message in the subject a few times, but after 1 or 2
retries, the update command succeeds.
The interesting part is that the command is executed on the server,
where the svn is located.
Does anybody know, how to fix this?
Thank you for your help,
Best regards,
Peter Bal
Hi
not long ago we have made some reorganization in repository, but forgot to make
svn:external relative instead of absolute
and I was really confused when build errors surprizingly appeared in an
unchanged tags
so I think it would be useful to print out external addresses too
eg not just
"Fet
How would you avoid overflowing the terminal width when the external's
URL is absolute?
Dmitry Bolshakov wrote on Thu, Dec 08, 2011 at 18:25:38 +0400:
> Hi
>
> not long ago we have made some reorganization in repository, but forgot to
> make svn:external relative instead of absolute
> and I was
> Dmitry Bolshakov wrote on Thu, Dec 08, 2011 at 18:25:38 +0400:
> > Hi
> >
> > not long ago we have made some reorganization in
> repository, but forgot to make svn:external relative instead
> of absolute
> > and I was really confused when build errors surprizingly
> appeared in an unchanged t
18 matches
Mail list logo
