Hi,
we have the following situation:
1. A branch is created from trunk.
2. In trunk a line of code is added and commited as revision X
3. The line is removed again and commited as revision X+1
4. In branch changeset X+1 is merged from trunk
5. In branch changeset X is merged from trunk.
The pro
Am 21.05.2011 19:12, schrieb Daniel Shahaf:
Does http://subversion.tigris.org/issues/show_bug.cgi?id=3884 describe
the problem you were seeing?
Yes. But I wonder why file sees a text file for you. In the repository
where I do the merge I see a symlink. I get a normal file only after a
new c
Hi,
do I have to open an issue for this?
Am 17.05.2011 13:24, schrieb Daniel Shahaf:
I committed
http://svn.apache.org/viewvc?view=rev&revision=r1104092
before I saw this mail from you.
(please add dev@ to CC if needed)
Christoph Bartoschek wrote on Tue, May 17, 2011 at 11:06:47 +0200:
file faq.en.html
faq.en.html: ASCII text, with no line terminators
%
]]]
I'll forward this to dev@ (CC'ing you).
Christoph Bartoschek wrote on Tue, May 17, 2011 at 09:24:30 +0200:
Hi,
I have a workarea where I merged in some changes from a completely
different repository. One of the changes
Hi,
I have a workarea where I merged in some changes from a completely
different repository. One of the changes was the creation of a link.
After checking in I see that the link is ok in my workarea but not in
any other workarea.
This due to the missing svn:special keyword that was not checke
Am Montag, 14. März 2011 schrieb Stefan Sperling:
> On Mon, Mar 14, 2011 at 05:11:03PM +0100, Christoph Bartoschek wrote:
> > Hi,
> >
> > I would like to merge the changes of a directory in repository A to a
> > directory in repository B. My problem is that several mer
Am Montag, 14. März 2011 schrieb Nico Kadel-Garcia:
> On Mon, Mar 14, 2011 at 12:11 PM, Christoph Bartoschek
>
> wrote:
> > Hi,
> >
> > I would like to merge the changes of a directory in repository A to a
> > directory in repository B. My problem is that sever
Am Montag, 14. März 2011 schrieb Stefan Sperling:
> On Mon, Mar 14, 2011 at 05:05:14PM +0100, Christoph Bartoschek wrote:
> > thanks for your suggestion. But the commit that created dirA also created
> > lots of other directories. I am only interessted in dirA.
>
> Then let&
Hi,
I would like to merge the changes of a directory in repository A to a
directory in repository B. My problem is that several merges fail because of
the id keywords.
Svn diff for example shows:
-/*
-** $Id: st_opt_small.c,v 1.3 2004/03/08 17:25:57 mueller Exp $
-**
-** $Locker: $
-*/
+/* $I
Am Montag, 14. März 2011 schrieb Stefan Sperling:
> On Mon, Mar 14, 2011 at 04:08:57PM +0100, Christoph Bartoschek wrote:
> > Hi,
> >
> > I would like to merge all changes in a directory from repository A to a
> > directory in repository B.
> >
> > My id
Hi,
I would like to merge all changes in a directory from repository A to a
directory in repository B.
My idea was to do a loop over all iterations and merge them to dirB:
svn merge -c rev file:///path/to/rep/A/dirA dirB
My problem is that for the revision where dirA is created in repositoryA
Am Dienstag, 16. November 2010 schrieb Stefan Sperling:
> On Tue, Nov 16, 2010 at 01:43:35PM +0100, Christoph Bartoschek wrote:
> > Hi,
> >
> > what is the advantage of using
> >
> > ^/trunk/project/subproj...@40 subproject
>
> This new format does su
Hi,
what is the advantage of using
^/trunk/project/subproj...@40 subproject
compared to
-r 40 ^/trunk/project/subproject subproject
?
Is it the case that the first version works if ^/trunk/project/subproject is
deleted in a later revision and the second version fails?
Christoph
Am Dienstag, 9. November 2010 schrieb Stefan Sperling:
> https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3727
>
> Please note that my fix hasn't been reviewed yet by other developers.
> If you encounter problems using this fix please let me know.
Thanks,
works for us as expected.
> The bug has been fixed in trunk. The fix has not been nominated for
> backport to 1.6.x yet but I will do so shortly.
>
> Until the fix appears in a new Subversion release, you can go back to
> 1.6.12. Alternatively, if you feel comfortable compiling svn yourself from
> source, you will be able
Am Freitag, 29. Oktober 2010 schrieb Daniel Shahaf:
> http://subversion.tigris.org/issues/show_bug.cgi?id=3727
>
> Chris Seawood wrote on Fri, Oct 29, 2010 at 10:04:17 -0700:
Hi,
our workflow currently does not work due to this bug. Is there a fixed 1.6.13
version in the repository we can check
Hi,
we are using the following layout for several years now:
1. We have one repository repo.
2. There are several projects in the repository:
repo/a
repo/b
repo/c
Each project has the standard layout trunk/tags/branches.
3. Then there is a product build from the projects (repo/Product) that
Am Donnerstag, 11. Februar 2010 schrieb Neels J Hofmeyr:
> Hi Christoph,
>
> it would be nice if you could provide a way to reproduce this issue. I am
> aware that this can be some work, and we would highly appreciate it. :)
Hi,
here is the script. When it comes to choosing the merge operation I
Hi,
after a merge with conflicts I completely wrong conflict markers:
=== inv_merge.C =
...
} else {
<<< .working
===
_cur.sinks(to_polarity(other)).append(csol.sinks());
>>> .merge-right.r13821
_cur.sinks(to_polarity(o
Hi,
owr http subversion server is in network A. I am in network B and can only
access network A via a ssh login on a machine that is in both networks.
Is there an easy way to use the svn client in network B such that it tunnels
over ssh to the http server in network A?
Thanks
Christoph
20 matches
Mail list logo
