Re: -bytes branch reports bogus conflict that trunk doesn't

2011-01-02 Thread Daniel Shahaf
Johan Corveleyn wrote on Sun, Jan 02, 2011 at 20:45:02 +0100: > On Sun, Jan 2, 2011 at 8:19 PM, Daniel Shahaf 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 wrote: > >> > Johan, > >> > > >> > I saw your sync merge, so I

Re: -bytes branch reports bogus conflict that trunk doesn't

2011-01-02 Thread Johan Corveleyn
On Sun, Jan 2, 2011 at 8:19 PM, Daniel Shahaf 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 wrote: >> > Johan, >> > >> > I saw your sync merge, so I ran 'svn up' with intent to rebuild.  When >> > I ran that 'up' with the b

Re: -bytes branch reports bogus conflict that trunk doesn't

2011-01-02 Thread Daniel Shahaf
Johan Corveleyn wrote on Sun, Jan 02, 2011 at 20:13:59 +0100: > On Sun, Jan 2, 2011 at 7:36 PM, Daniel Shahaf 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

Re: -bytes branch reports bogus conflict that trunk doesn't

2011-01-02 Thread Johan Corveleyn
On Sun, Jan 2, 2011 at 7:36 PM, Daniel Shahaf 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.) Did you do that w

-bytes branch reports bogus conflict that trunk doesn't

2011-01-02 Thread Daniel Shahaf
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 conf