: Wednesday, September 10, 2014 7:32 AM
To: Andreas Tscharner
Cc: John Maher; Subversion help
Subject: Re: Merge problem
On Wed, Sep 10, 2014 at 10:56:42AM +, Andreas Tscharner wrote:
[snip]
Just wondering if anyone may have an idea how my repository got so
buggered up. I tried to merge a branch
...@elego.de]
Sent: Wednesday, September 10, 2014 4:24 AM
To: John Maher
Cc: Subversion help
Subject: Re: Merge problem
On Tue, Sep 09, 2014 at 06:48:31PM +, John Maher wrote:
Hello
Just wondering if anyone may have an idea how my repository got so buggered
up. I tried to merge a branch
how they came into existence?
-Original Message-
From: Stefan Sperling [mailto:s...@elego.de]
Sent: Wednesday, September 10, 2014 4:24 AM
To: John Maher
Cc: Subversion help
Subject: Re: Merge problem
On Tue, Sep 09, 2014 at 06:48:31PM +, John Maher wrote:
Hello
Just
On Thu, Sep 11, 2014 at 12:03:36PM +, Markus Schaber wrote:
Hi, John,
I guess Stefans question for more details was directed to Andreas and his
rather unspecific rant, not to your email.
Correct :)
Maher
Cc: Subversion help
Subject: Re: Merge problem
On Thu, Sep 11, 2014 at 11:56:22AM +, John Maher wrote:
Thanks for your reply Stefan. There are no subdirs on either my trunk or
branches. The command I used was (from the working copy of (for example)
https://server/svn/erp/trunk) svn
On Tue, Sep 09, 2014 at 06:48:31PM +, John Maher wrote:
Hello
Just wondering if anyone may have an idea how my repository got so buggered
up. I tried to merge a branch to the trunk and received 49 conflicts. 2 are
files that do not need to be tracked so that leaves 47. Out of the 47
[snip]
Just wondering if anyone may have an idea how my repository
got so buggered up. I tried to merge a branch to the trunk
and received 49 conflicts. 2 are files that do not need to
be tracked so that leaves 47. Out of the 47 there are two
problems, local add, incoming add upon
On Wed, Sep 10, 2014 at 10:56:42AM +, Andreas Tscharner wrote:
[snip]
Just wondering if anyone may have an idea how my repository
got so buggered up. I tried to merge a branch to the trunk
and received 49 conflicts. 2 are files that do not need to
be tracked so that leaves 47.
On Sat, Nov 12, 2011 at 06:53:54PM +0100, Gunnar Dalsnes wrote:
On 11.11.2011 16:51, Philip Martin wrote:
You can't revert wc/D/f without reverting the replace of wc/D.
Does this mean it's not possible to merge if the same dir is created
both in trunk and in branch? Can the replace of the
On 11.11.2011 16:51, Philip Martin wrote:
You can't revert wc/D/f without reverting the replace of wc/D.
Does this mean it's not possible to merge if the same dir is created
both in trunk and in branch? Can the replace of the duplicate dir be
avoided somehow? If not, it would be nice with an
I can make a Linux script if that will help...
On 10.11.2011 17:17, Gunnar Dalsnes wrote:
On 10.11.2011 12:26, Philip Martin wrote:
Gunnar Dalsneshar...@online.no writes:
REM change this to the dir you are running the script from
set wd=c:/temp/test
svnadmin create repo
svn mkdir
Gunnar Dalsnes har...@online.no writes:
REM tree conflict
svn resolve --accept=working dir1
Did you miss a step?
No, nothing is missed, but it seems this line is useless (but
harmless). The problem appears regardless.
trunk2 is still an empty directory at r1, how can
that cause a
Philip Martin philip.mar...@wandisco.com writes:
The merge creates an added directory wc/D (copied from /T/D in the
repo). This conflicts with the directory D added by the update (which
is /X/B in the repo) so a tree conflict is created. Note that wc/D is
Typo: /X/B should be /B/D.
marked
Gunnar Dalsnes har...@online.no writes:
REM change this to the dir you are running the script from
set wd=c:/temp/test
svnadmin create repo
svn mkdir file:///%wd%/repo/trunk -m test
svn co file:///%wd%/repo/trunk trunk1
svn co file:///%wd%/repo/trunk trunk2
trunk2 is an empty directory
On 10.11.2011 12:26, Philip Martin wrote:
Gunnar Dalsneshar...@online.no writes:
REM change this to the dir you are running the script from
set wd=c:/temp/test
svnadmin create repo
svn mkdir file:///%wd%/repo/trunk -m test
svn co file:///%wd%/repo/trunk trunk1
svn co
; Strucken, Andreas
Subject: Re: Merge problem with different users
On Mon, Sep 06, 2010 at 02:44:30AM -0700, Ungruhe, Michael wrote:
The merge user is just a user account. Since we noticed that the
problem described earlier only occurs when the merging is made by
different users (on different
itself are still different, but they use
the same account.
-Original Message-
From: Stefan Sperling [mailto:s...@elego.de]
Sent: Freitag, 3. September 2010 11:08
To: Ungruhe, Michael
Cc: users@subversion.apache.org; Strucken, Andreas
Subject: Re: Merge problem with different users
On Fri
On Fri, Sep 03, 2010 at 12:53:34AM -0700, Ungruhe, Michael wrote:
Hi,
We noticed the following problem:
We are usually working on the trunk, but for a change request we created a
branch. Development continued on both, the trunk and the branch.
Some changes were made on the
18 matches
Mail list logo
