Stanimir: your comment is pure gold. Thank you very much.
On Tuesday, May 24, 2011 11:11:20 AM UTC-4, Stanimir Stamenkov wrote:
>
> Tue, 24 May 2011 10:45:09 -0400, /David Tombs/:
>
> > I created the same directory, called 'config' on two branches. The
> > directory had different files on each bra
On 05/25/2011 07:45 AM, Stephen Butler wrote:
> Hi David,
>
> Attached is a reproduction script. I could reproduce the corrupted working
> copy in 1.6.16.
>
> With 1.7 (r1127008), the corruption doesn't occur, but there's still a bug:
> 'svn status' displays bar.java (as deleted) after the merge
On May 25, 2011, at 1:35 , David Tombs wrote:
> On 05/24/2011 11:05 AM, Stefan Sperling wrote:
>> On Tue, May 24, 2011 at 10:45:09AM -0400, David Tombs wrote:
>>> Hi Subversion Gurus,
>>>
>>> I have a question about merging with a tree conflict.
>>>
>>> I created the same directory, called 'con
On Tue, May 24, 2011 at 07:35:49PM -0400, David Tombs wrote:
> Thanks for the response. Unfortunately, I don't think my solution turned
> out very well. I ended up with a corrupted working copy that thought
> bar.java was there but the server disagreed whenever I did a
> server-hitting command.
Re
On 05/24/2011 11:05 AM, Stefan Sperling wrote:
> On Tue, May 24, 2011 at 10:45:09AM -0400, David Tombs wrote:
>> Hi Subversion Gurus,
>>
>> I have a question about merging with a tree conflict.
>>
>> I created the same directory, called 'config' on two branches. The
>> directory had different files
On Tue, May 24, 2011 at 05:05:43PM +0200, Stefan Sperling wrote:
> In short, whatever works for you is best :)
That said, our goal is to ultimately provide automated resolution
of trivial tree conflicts, and interactive menus for resolving more
complicated ones. The plumbing isn't yet advanced eno
Tue, 24 May 2011 10:45:09 -0400, /David Tombs/:
I created the same directory, called 'config' on two branches. The
directory had different files on each branch, let's call them 'foo.java'
on branch A and 'bar.java' on branch B.
When I merged branch A -> branch B, I got a "tree conflict" saying
On Tue, May 24, 2011 at 10:45:09AM -0400, David Tombs wrote:
> Hi Subversion Gurus,
>
> I have a question about merging with a tree conflict.
>
> I created the same directory, called 'config' on two branches. The
> directory had different files on each branch, let's call them 'foo.java'
> on bran
On Thu, Aug 05, 2010 at 08:56:15AM +0200, Ulrich Eckhardt wrote:
> On Wednesday 04 August 2010, Tyler Roscoe wrote:
> >
> > If there are no changes, I would delete the directory from branchx and
> > then merge from trunk to recreate the directory on branchx.
>
> Why not simply merge the revision w
On Wednesday 04 August 2010, Tyler Roscoe wrote:
> On Wed, Aug 04, 2010 at 03:44:24PM +, Mark Wakim wrote:
> > There are no code changes between myDirectory in trunk and BranchX.
> > Why am I getting this conflict? I thought svn copy was the proper way
> > to copy files/directories between bra
t; Subject: Re: Tree conflict: local add, incoming add upon merge
>
> On Wed, Aug 04, 2010 at 03:44:24PM +, Mark Wakim wrote:
> > I am working on a project where we have trunk, and a branch which I
> > will call BranchX. A couple weks ago I added a directory
> > (myDirect
On Wed, Aug 04, 2010 at 03:44:24PM +, Mark Wakim wrote:
> I am working on a project where we have trunk, and a branch which I
> will call BranchX. A couple weks ago I added a directory
> (myDirectory) to trunk, I then did an svn copy to add that directory
> to BranchX.
The best way to get cha
12 matches
Mail list logo