Re: svn merge - repeat merge is not a no-op

2010-02-11 Thread Paul Burba
On Thu, Feb 11, 2010 at 7:44 AM, Julian Foad wrote: > On Tue, 2010-02-09, Paul Burba wrote: >> On Tue, Jan 26, 2010 at 6:01 PM, Paul Burba wrote: >> > On Mon, Jan 25, 2010 at 12:45 PM, Paul Burba wrote: >> >> On Mon, Jan 25, 2010 at 9:32 AM, Julian Foad >> >> wrote: >> >>> After merging all ch

Re: svn merge - repeat merge is not a no-op

2010-02-11 Thread Julian Foad
On Tue, 2010-02-09, Paul Burba wrote: > On Tue, Jan 26, 2010 at 6:01 PM, Paul Burba wrote: > > On Mon, Jan 25, 2010 at 12:45 PM, Paul Burba wrote: > >> On Mon, Jan 25, 2010 at 9:32 AM, Julian Foad > >> wrote: > >>> After merging all changes from a branch into the WC, a second attempt of > >>> t

Re: svn merge - repeat merge is not a no-op

2010-02-09 Thread Paul Burba
On Tue, Jan 26, 2010 at 6:01 PM, Paul Burba wrote: > On Mon, Jan 25, 2010 at 12:45 PM, Paul Burba wrote: >> On Mon, Jan 25, 2010 at 9:32 AM, Julian Foad >> wrote: >>> After merging all changes from a branch into the WC, a second attempt of >>> the same merge brings in a different file. >>> >>>

Re: svn merge - repeat merge is not a no-op

2010-01-26 Thread Paul Burba
On Mon, Jan 25, 2010 at 12:45 PM, Paul Burba wrote: > On Mon, Jan 25, 2010 at 9:32 AM, Julian Foad wrote: >> After merging all changes from a branch into the WC, a second attempt of >> the same merge brings in a different file. >> >> Full Details >> >> I tried a merge in a clean WC of the branch

Re: svn merge - repeat merge is not a no-op

2010-01-25 Thread Paul Burba
On Mon, Jan 25, 2010 at 9:32 AM, Julian Foad wrote: > After merging all changes from a branch into the WC, a second attempt of > the same merge brings in a different file. > > Full Details > > I tried a merge in a clean WC of the branch 1@902803, using an > r902780M trunk build of svn. (I conf

svn merge - repeat merge is not a no-op

2010-01-25 Thread Julian Foad
After merging all changes from a branch into the WC, a second attempt of the same merge brings in a different file. Full Details I tried a merge in a clean WC of the branch 1@902803, using an r902780M trunk build of svn. (I confirmed with an r902508 trunk build that excludes the recent patch