Johan,
I saw your sync merge, so I ran 'svn up' with intent to rebuild. When
I ran that 'up' with the branch build, I got a conflict, which didn't
appear when I ran it with a trunk build. (See attached transcript.)
Furthermore, the conflict resolution (a) marked all the head of the file
as
On Sun, Jan 2, 2011 at 7:36 PM, Daniel Shahaf danie...@apache.org wrote:
Johan,
I saw your sync merge, so I ran 'svn up' with intent to rebuild. When
I ran that 'up' with the branch build, I got a conflict, which didn't
appear when I ran it with a trunk build. (See attached transcript.)
Johan Corveleyn wrote on Sun, Jan 02, 2011 at 20:13:59 +0100:
On Sun, Jan 2, 2011 at 7:36 PM, Daniel Shahaf danie...@apache.org wrote:
Johan,
I saw your sync merge, so I ran 'svn up' with intent to rebuild. When
I ran that 'up' with the branch build, I got a conflict, which didn't
On Sun, Jan 2, 2011 at 8:19 PM, Daniel Shahaf danie...@apache.org wrote:
Johan Corveleyn wrote on Sun, Jan 02, 2011 at 20:13:59 +0100:
On Sun, Jan 2, 2011 at 7:36 PM, Daniel Shahaf danie...@apache.org wrote:
Johan,
I saw your sync merge, so I ran 'svn up' with intent to rebuild. When
I
Johan Corveleyn wrote on Sun, Jan 02, 2011 at 20:45:02 +0100:
On Sun, Jan 2, 2011 at 8:19 PM, Daniel Shahaf danie...@apache.org wrote:
Johan Corveleyn wrote on Sun, Jan 02, 2011 at 20:13:59 +0100:
On Sun, Jan 2, 2011 at 7:36 PM, Daniel Shahaf danie...@apache.org wrote:
Johan,
I saw
5 matches
Mail list logo