|
From: Ashley P. <as...@pi...> - 2009-01-27 09:46:36
|
On Mon, 2009-01-26 at 14:28 +0000, Tom Hughes wrote: > Julian Seward wrote: > > > I'm doing some merging of stuff into 3_4_BRANCH. Before I commit > > every merge I like to do svn diff -rHEAD to see what I'm about > > to commit. In a trunk tree that works as expected. However, in a > > 3_4_BRANCH tree I get a load of other output too, which I don't > > understand. > > > > The unexpected output is shown below. Is it significant? > > What does it mean? And how can I get rid of it? > > The svn:mergeinfo property is used by recent versions of subversion to > track what merges have been done - it means that if you merge a branch a > second time it knows which edits have already been merged and doesn't > need to do them again. > > It may well be entirely normal for it to be deleted sometimes during a > merge - I don't really have enough experience with it to know. I read this to mean that the 3_4_BRANCH has had something merged to it but the HEAD has not, in which case it could be safely ignored. Ashley, |